Merge "Fix testCpuAbi for 64bit only sys" into android10-tests-dev