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

Change-Id: I9742eadf7e7de255c73bce7a8246a6e5247526ca