am 0b7d6de1: Fix the build.

Merge commit '0b7d6de1559a4a78af76ab501e0a15afc396c2b9' into gingerbread-plus-aosp

* commit '0b7d6de1559a4a78af76ab501e0a15afc396c2b9':
  Fix the build.