Merge "Remove obsolete reference to ServiceManagerNative." am: f961b9632f am: 045d5884fe am: 31bfec7f19
am: bea4d435e9

Change-Id: Ibd7df1939374da9bbf9e69b025db3b6ce279fbf6