Merge "Allow 2.3.6 in BuildVersionTest" into gingerbread