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

Change-Id: I898c63bc1583176c297f7c0768c9f28cee7cddec