Merge "libbinder_ndk: AServiceManager_checkService # apex"
am: 7d3f8168e0

Change-Id: I13c6895098e3ed908563207860dbe304c63ee681