am 2336c4ec: Merge "Fix build."

* commit '2336c4ecc5735eb374e5c804b1fe863650c24d7f':
  Fix build.