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

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