am 941f0d49: am 5dcdc935: Merge "Fix implicit check option handling for non-cross-compiles"

* commit '941f0d492def26f7001dcab8ec67e2b3a807e413':
  Fix implicit check option handling for non-cross-compiles