am c6ecccb2: Merge "Fix the build." into gingerbread

Merge commit 'c6ecccb284401b6312108f927ffcfc303872f380' into gingerbread-plus-aosp

* commit 'c6ecccb284401b6312108f927ffcfc303872f380':
  Fix the build.