Merge "IServiceManager: no DECLARE_META_INTERFACE"
am: b51de829b6

Change-Id: Icb02bfaa35f6f51ac63147ff66d020912fea8b6b