Merge "Allow com.android.* classes in system_service stubs"