am 54901c9e: fix the build.  will revisit this change in a minute

Merge commit '54901c9e8497b33bab1462245864e9dd119bb64c' into gingerbread-plus-aosp

* commit '54901c9e8497b33bab1462245864e9dd119bb64c':
  fix the build.  will revisit this change in a minute