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

* commit '5dcdc93539ddf48757b6d5ea9393812d6bf9861d':
  Fix implicit check option handling for non-cross-compiles