Merge "Fix Build" into gingerbread