Merge "adb: fix apex installation." am: f8dc296dfd am: 39f4a75392

Change-Id: I89c773a5d5169c01e9ca58f1f8f6575d4e0882a8