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

Change-Id: I374431125b313f291953ab1c455406afa4178b8f