Merge "libbinder_ndk: fix failure when dump/shell are unset"