Merge "libbinder_ndk: clarify descriptor encoding"