Merge "libbinder_ndk: rename things according to convention"