Merge "Update BuildVersionTest for 2.2 and 2.2.1" into froyo