Merge "Fix hang of `adb shell cmd resources dump ...`"