am 1aa6708c: Fix the build. Oops.

Merge commit '1aa6708cc2b7792a647ada960a66a1e0146fb209' into gingerbread-plus-aosp

* commit '1aa6708cc2b7792a647ada960a66a1e0146fb209':
  Fix the build. Oops.