Fix android.os.cts.BuildVersionTest failure

Change-Id: Ic04d359be9b74d7f3afadbf09d2c4e0563d87d18
merge CyanogenMod

Change-Id: I6aa92d67272d9054b5adc138297ef89b2ff12f41