am 4e26c95a: Merge "Skip the "--abi" flag on "adb install" if present."

* commit '4e26c95a6363da4885bb9178c9d42c273b357043':
  Skip the "--abi" flag on "adb install" if present.