am 4637dc40: Merge "Update BuildVersionTest" into gingerbread

* commit '4637dc40b954e32217c103f6e2401e941a03af43':
  Update BuildVersionTest