Merge "Skip the "--abi" flag on "adb install" if present."