Merge "Merge "Fix FD leak during ADB shell install." am: c558f4cedf am: 9882ad7a27 am: 139124cd77"