am 639b823b: Merge "Fix build." into eclair

Merge commit '639b823b287211a67e525238c5f2f4e2a9ebc0c6' into eclair-plus-aosp

* commit '639b823b287211a67e525238c5f2f4e2a9ebc0c6':
  Fix build.