am c090a5b8: Merge "Allow 2.3.6 in BuildVersionTest" into gingerbread

* commit 'c090a5b82b334e47795922ac48c412a5d0ff6804':
  Allow 2.3.6 in BuildVersionTest