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

Change-Id: Ic7a64ae313d53c6d08774061d51b02ced498ddb5