Fix android.os.cts.BuildVersionTest failure

Change-Id: Ic04d359be9b74d7f3afadbf09d2c4e0563d87d18
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_device_lge_mako into linaro