Merge "adb: fix apex installation."