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

* commit 'ec27e78ddc838d4104d0c7d478bfa0a69baeec6e':
  Fix BuildVersionTest