Merge "Remove obsolete reference to ServiceManagerNative." am: f961b963 am: 045d5884 am: 31bfec7f am: bea4d435 Change-Id: Ibd7df1939374da9bbf9e69b025db3b6ce279fbf6