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

Change-Id: I55a6e43fca47d55061b173f824bfa8b202076d17