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

Change-Id: I42b78ab68d81ae9b40b9429ecd684de73ceffd37