Merge "Remove obsolete reference to ServiceManagerNative."