am 27cf4ad8: Fix build.

Merge commit '27cf4ad88ff8ba2b64d806b0ebb0181b1f42c888' into gingerbread-plus-aosp

* commit '27cf4ad88ff8ba2b64d806b0ebb0181b1f42c888':
  Fix build.