Merge "libbinder_ndk: mv include_{apex,platform}"