Merge "IServiceManager: no DECLARE_META_INTERFACE" am: b51de829b6 am: f6ba84ac39 am: fde545836b
am: 2c00618e99

Change-Id: I9a957975c8bc678de8d5386e7d0b96f823f69fab