Merge changes Ic2e27f56,Ie19e0995

* changes:
  Remove references to setPermissionController.
  ServiceManagerNative: delete unused methods