Merge "Fix FD leak during ADB shell install."