Merge changes from topic "libbinder_ndk_llndk" am: 2f5382d27d
am: fcc8248c43

Change-Id: I4e1cd9fda575f96e24b295ed7055f6c453af4cdf