am 6f534125: Merge "Fix Linux host checkbuilds."

* commit '6f5341259c6b6684acb4e91d9220593c231abecd':
  Fix Linux host checkbuilds.