am ddcac09d: Merge "Avoid cpu mismatch to ARM during cross compiling"

* commit 'ddcac09de5bc3174f9cafe535a900bc0afeae5d6':
  Avoid cpu mismatch to ARM during cross compiling