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

Change-Id: I3ce241b4c9c48d20eaa5cb221ff8d04c215ca713