am 4fd76ba2: am 81f339bc: Merge "Fixing the build." into gingerbread

Merge commit '4fd76ba2270da1df12ae11f6d3d3ed564e38464b'

* commit '4fd76ba2270da1df12ae11f6d3d3ed564e38464b':
  Fixing the build.