Merge "Fix Build" into froyo