Merge "libbinder_ndk: fix failure when dump/shell are unset" into rvc-dev-plus-aosp