am 95fa7050: am ec27e78d: (-s ours) am 0cfbb02f: Merge "Fix BuildVersionTest" into gingerbread

* commit '95fa70505030cbb17fa3292fc22eed6e30c7a00c':
  Fix BuildVersionTest