Merge "Fix build." into gingerbread