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

Change-Id: Ieb0fa20813ec1c9393fb134a0cc333ab5041366b