am 19b68add: am 46878a65: Merge "Fix Build" into froyo

* commit '19b68add2857e75ab9303c4e32f1abe987d7186d':
  Fix Build