Merge "Check More Build Constants" into gingerbread