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

Change-Id: I6a8053db6ff17f64fddf6149424b21f30dc49b09