Merge "[automerger skipped] libbinder_ndk: fix failure when dump/shell are unset am: deb5346761 am: 6674db2de2 am: f52275440b -s ours" into rvc-qpr-dev-plus-aosp