Merge "Fix implicit check option handling for non-cross-compiles"