am 45dc56f3: Merge "Fix build."

# Via Android (Google) Code Review (1) and Craig Mautner (1)
* commit '45dc56f3cc6cf890d2f8a28021f46ad1e9028f5e':
  Fix build.