Merge "Update the libbinder_ndk header file on master-art for aosp/3212142." into main