Merge "Remove obsolete reference to ServiceManagerNative."
am: f961b9632f

Change-Id: I1b3365d9c07f5ca01a886ef453d2af392505c8ee