am b849f6dd: Merge "Fix linux build."

* commit 'b849f6dd638fd1246724160cd5c01ab1a5ff33bd':
  Fix linux build.