Merge "libbinder_ndk: allow disabling interface token"