Merge "libbinder_ndk: formatting"