am 313c80f4: am 849f7dc3: Merge "Modify testcases testCpuAbi for x86 devices"

* commit '313c80f44057043c3a4b20ef052bfb9681d07951':
  Modify testcases testCpuAbi for x86 devices