Merge "Update IActivityManager, ContentProviderHolder in preloaded-classes."