am 25f1c987: am ef9d3f45: Merge "Skip the "--abi" flag on "adb install" if present."

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