Merge "Additional sysroot checks."