am ff11bce0: am 07bdc2b8: Merge "Fix build."

* commit 'ff11bce0978d56ce571454d16084028df4106e13':
  Fix build.