am 46878a65: Merge "Fix Build" into froyo

* commit '46878a65e3915d9eb42043dc812404a37c013acd':
  Fix Build