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

* commit '344c33949b48ec5f3d27bff36f145f157156cf19':
  Fix Linux host checkbuilds.