am 385da290: Merge "Check More Build Constants" into gingerbread

* commit '385da290cf6dce20bfebf690dcd314537123aaba':
  Check More Build Constants