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