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

* commit 'f4535b257f6ca60545b50952886c3d1e35a339f0':
  HACK: use CPU_ABI hack only for arm64