am 366894b5: am 0a6a80f4: Fix build.

* commit '366894b544e723b11f591a3071599066d0ada2da':
  Fix build.