Merge "Move some binder stub methods back to max-sdk-o list."