Fix android.os.cts.BuildVersionTest failure

Change-Id: Ic04d359be9b74d7f3afadbf09d2c4e0563d87d18
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1-var2