am 0cfbb02f: Merge "Fix BuildVersionTest" into gingerbread

* commit '0cfbb02f2424f2425457afd0b2528dd819272364':
  Fix BuildVersionTest