am 8e14bac8: am f4535b25: Merge "HACK: use CPU_ABI hack only for arm64" into lmp-dev

* commit '8e14bac8be1bedd6da24330d477add1b0279c8a1':
  HACK: use CPU_ABI hack only for arm64