Update Nexus 6P mock test

3 files changed, 416 insertions, 705 deletions

diff --git a/test/build.prop/nexus6p.log b/test/build.prop/nexus6p.log
index 8bb2747..ea3c9f8 100644
--- a/test/build.prop/nexus6p.log
+++ b/test/build.prop/nexus6p.log
@@ -11,21 +11,21 @@ import /oem/oem.prop ro.oem.*
 import /oem/oem.prop oem.*
 # begin build properties
 # autogenerated by buildinfo.sh
-ro.build.id=MTC19X
-ro.build.display.id=MTC19X
-ro.build.version.incremental=2960136
-ro.build.version.sdk=23
-ro.build.version.preview_sdk=
+ro.build.id=N2G47O
+ro.build.display.id=N2G47O
+ro.build.version.incremental=3852959
+ro.build.version.sdk=25
+ro.build.version.preview_sdk=0
 ro.build.version.codename=REL
 ro.build.version.all_codenames=REL
-ro.build.version.release=6.0.1
-ro.build.version.security_patch=2016-07-05
+ro.build.version.release=7.1.2
+ro.build.version.security_patch=2017-05-05
 ro.build.version.base_os=
-ro.build.date=Thu Jun  9 18:58:55 UTC 2016
-ro.build.date.utc=1465498735
+ro.build.date=Mon Mar 27 18:32:57 UTC 2017
+ro.build.date.utc=1490639577
 ro.build.type=user
 ro.build.user=android-build
-ro.build.host=vpef9.mtv.corp.google.com
+ro.build.host=vped7.mtv.corp.google.com
 ro.build.tags=release-keys
 ro.build.flavor=angler-user
 ro.product.model=Nexus 6P
@@ -46,8 +46,8 @@ ro.board.platform=msm8994
 # ro.build.product is obsolete; use ro.product.device
 ro.build.product=angler
 # Do not try to parse description, fingerprint, or thumbprint
-ro.build.description=angler-user 6.0.1 MTC19X 2960136 release-keys
-ro.build.fingerprint=google/angler/angler:6.0.1/MTC19X/2960136:user/release-keys
+ro.build.description=angler-user 7.1.2 N2G47O 3852959 release-keys
+ro.build.fingerprint=google/angler/angler:7.1.2/N2G47O/3852959:user/release-keys
 ro.build.characteristics=nosdcard
 # end build properties
 
@@ -65,7 +65,10 @@ ro.carrier=unknown
 ro.com.android.wifi-watchlist=GoogleGuest
 ro.error.receiver.system.apps=com.google.android.gms
 ro.setupwizard.enterprise_mode=1
-ro.opengles.version=196609
+ro.atrace.core.services=com.google.android.gms,com.google.android.gms.ui,com.google.android.gms.persistent
+ro.retaildemo.video_path=/data/preloads/demo/retail_demo.mp4
+ro.com.android.prov_mobiledata=false
+ro.opengles.version=196610
 ro.sf.lcd_density=560
 persist.hwc.mdpcomp.enable=true
 persist.data.mode=concurrent
@@ -86,7 +89,7 @@ vidc.debug.perf.mode=2
 vidc.enc.dcvs.extra-buff-count=2
 ro.min_freq_0=384000
 ro.vendor.extension_library=libqti-perfd-client.so
-rild.libpath=/system/vendor/lib64/libril-qc-qmi-1.so
+rild.libpath=/vendor/lib64/libril-qc-qmi-1.so
 ro.telephony.default_cdma_sub=0
 ro.telephony.default_network=10
 telephony.lteOnCdmaDevice=1
@@ -111,9 +114,10 @@ persist.sys.ssr.restart_level=ALL_ENABLE
 persist.camera.eis.enable=1
 persist.camera.is_type=4
 dalvik.vm.boot-dex2oat-threads=4
-dalvik.vm.dex2oat-threads=2
+dalvik.vm.dex2oat-threads=4
 dalvik.vm.image-dex2oat-threads=4
 persist.radio.redir_party_num=0
+ro.product.first_api_level=23
 dalvik.vm.heapstartsize=8m
 dalvik.vm.heapgrowthlimit=192m
 dalvik.vm.heapsize=512m
@@ -122,20 +126,19 @@ dalvik.vm.heapminfree=512k
 dalvik.vm.heapmaxfree=8m
 keyguard.no_require_sim=true
 drm.service.enabled=true
-ro.facelock.black_timeout=400
-ro.facelock.det_timeout=1500
-ro.facelock.rec_timeout=2500
-ro.facelock.lively_timeout=2500
+ro.setupwizard.rotation_locked=true
+ro.facelock.black_timeout=700
+ro.facelock.det_timeout=2500
+ro.facelock.rec_timeout=3500
 ro.facelock.est_max_time=600
-ro.facelock.use_intro_anim=false
-persist.sys.dalvik.vm.lib.2=libart
+persist.sys.dalvik.vm.lib.2=libart.so
 dalvik.vm.isa.arm64.variant=cortex-a53
 dalvik.vm.isa.arm64.features=default
-dalvik.vm.isa.arm.variant=cortex-a7
+dalvik.vm.isa.arm.variant=cortex-a53.a57
 dalvik.vm.isa.arm.features=default
 net.bt.name=Android
 dalvik.vm.stack-trace-file=/data/anr/traces.txt
-ro.build.expect.bootloader=angler-03.52
-ro.build.expect.baseband=angler-03.61
-ro.expect.recovery_id=0x4529b1d7722a656849158a9584ad6193c5d55be0000000000000000000000000
+ro.build.expect.bootloader=angler-03.68
+ro.build.expect.baseband=angler-03.81
+ro.expect.recovery_id=0xe0ffcc9788ff3d40010da368597592ca5492bd05000000000000000000000000
 
diff --git a/test/cpuinfo/nexus6p.armeabi.log b/test/cpuinfo/nexus6p.armeabi.log
new file mode 100644
index 0000000..61c2b54
--- /dev/null
+++ b/test/cpuinfo/nexus6p.armeabi.log
@@ -0,0 +1,17 @@
+Processor	: AArch64 Processor rev 2 (aarch64)
+processor	: 0
+processor	: 1
+processor	: 2
+processor	: 3
+processor	: 4
+processor	: 5
+processor	: 6
+processor	: 7
+Features	: fp asimd evtstrm aes pmull sha1 sha2 crc32 wp half thumb fastmult vfp edsp neon vfpv3 tlsi vfpv4 idiva idivt 
+CPU implementer	: 0x41
+CPU architecture: 8
+CPU variant	: 0x0
+CPU part	: 0xd03
+CPU revision	: 2
+
+Hardware	: Qualcomm Technologies, Inc MSM8994
diff --git a/test/mock/nexus6p.h b/test/mock/nexus6p.h
index 8c1d3cc..95c1ed8 100644
--- a/test/mock/nexus6p.h
+++ b/test/mock/nexus6p.h
@@ -1,4 +1,5 @@
 struct cpuinfo_mock_file filesystem[] = {
+#if CPUINFO_ARCH_ARM64
 	{
 		.path = "/proc/cpuinfo",
 		.size = 355,
@@ -21,9 +22,33 @@ struct cpuinfo_mock_file filesystem[] = {
 			"\n"
 			"Hardware\t: Qualcomm Technologies, Inc MSM8994\n",
 	},
+#elif CPUINFO_ARCH_ARM
+	{
+		.path = "/proc/cpuinfo",
+		.size = 421,
+		.content =
+			"Processor\t: AArch64 Processor rev 2 (aarch64)\n"
+			"processor\t: 0\n"
+			"processor\t: 1\n"
+			"processor\t: 2\n"
+			"processor\t: 3\n"
+			"processor\t: 4\n"
+			"processor\t: 5\n"
+			"processor\t: 6\n"
+			"processor\t: 7\n"
+			"Features\t: fp asimd evtstrm aes pmull sha1 sha2 crc32 wp half thumb fastmult vfp edsp neon vfpv3 tlsi vfpv4 idiva idivt \n"
+			"CPU implementer\t: 0x41\n"
+			"CPU architecture: 8\n"
+			"CPU variant\t: 0x0\n"
+			"CPU part\t: 0xd03\n"
+			"CPU revision\t: 2\n"
+			"\n"
+			"Hardware\t: Qualcomm Technologies, Inc MSM8994\n",
+	},
+#endif
 	{
 		.path = "/system/build.prop",
-		.size = 4689,
+		.size = 4897,
 		.content =
 			"\n"
 			"#\n"
@@ -38,21 +63,21 @@ struct cpuinfo_mock_file filesystem[] = {
 			"import /oem/oem.prop oem.*\n"
 			"# begin build properties\n"
 			"# autogenerated by buildinfo.sh\n"
-			"ro.build.id=MTC19X\n"
-			"ro.build.display.id=MTC19X\n"
-			"ro.build.version.incremental=2960136\n"
-			"ro.build.version.sdk=23\n"
-			"ro.build.version.preview_sdk=\n"
+			"ro.build.id=N2G47O\n"
+			"ro.build.display.id=N2G47O\n"
+			"ro.build.version.incremental=3852959\n"
+			"ro.build.version.sdk=25\n"
+			"ro.build.version.preview_sdk=0\n"
 			"ro.build.version.codename=REL\n"
 			"ro.build.version.all_codenames=REL\n"
-			"ro.build.version.release=6.0.1\n"
-			"ro.build.version.security_patch=2016-07-05\n"
+			"ro.build.version.release=7.1.2\n"
+			"ro.build.version.security_patch=2017-05-05\n"
 			"ro.build.version.base_os=\n"
-			"ro.build.date=Thu Jun  9 18:58:55 UTC 2016\n"
-			"ro.build.date.utc=1465498735\n"
+			"ro.build.date=Mon Mar 27 18:32:57 UTC 2017\n"
+			"ro.build.date.utc=1490639577\n"
 			"ro.build.type=user\n"
 			"ro.build.user=android-build\n"
-			"ro.build.host=vpef9.mtv.corp.google.com\n"
+			"ro.build.host=vped7.mtv.corp.google.com\n"
 			"ro.build.tags=release-keys\n"
 			"ro.build.flavor=angler-user\n"
 			"ro.product.model=Nexus 6P\n"
@@ -73,8 +98,8 @@ struct cpuinfo_mock_file filesystem[] = {
 			"# ro.build.product is obsolete; use ro.product.device\n"
 			"ro.build.product=angler\n"
 			"# Do not try to parse description, fingerprint, or thumbprint\n"
-			"ro.build.description=angler-user 6.0.1 MTC19X 2960136 release-keys\n"
-			"ro.build.fingerprint=google/angler/angler:6.0.1/MTC19X/2960136:user/release-keys\n"
+			"ro.build.description=angler-user 7.1.2 N2G47O 3852959 release-keys\n"
+			"ro.build.fingerprint=google/angler/angler:7.1.2/N2G47O/3852959:user/release-keys\n"
 			"ro.build.characteristics=nosdcard\n"
 			"# end build properties\n"
 			"\n"
@@ -92,7 +117,10 @@ struct cpuinfo_mock_file filesystem[] = {
 			"ro.com.android.wifi-watchlist=GoogleGuest\n"
 			"ro.error.receiver.system.apps=com.google.android.gms\n"
 			"ro.setupwizard.enterprise_mode=1\n"
-			"ro.opengles.version=196609\n"
+			"ro.atrace.core.services=com.google.android.gms,com.google.android.gms.ui,com.google.android.gms.persistent\n"
+			"ro.retaildemo.video_path=/data/preloads/demo/retail_demo.mp4\n"
+			"ro.com.android.prov_mobiledata=false\n"
+			"ro.opengles.version=196610\n"
 			"ro.sf.lcd_density=560\n"
 			"persist.hwc.mdpcomp.enable=true\n"
 			"persist.data.mode=concurrent\n"
@@ -113,7 +141,7 @@ struct cpuinfo_mock_file filesystem[] = {
 			"vidc.enc.dcvs.extra-buff-count=2\n"
 			"ro.min_freq_0=384000\n"
 			"ro.vendor.extension_library=libqti-perfd-client.so\n"
-			"rild.libpath=/system/vendor/lib64/libril-qc-qmi-1.so\n"
+			"rild.libpath=/vendor/lib64/libril-qc-qmi-1.so\n"
 			"ro.telephony.default_cdma_sub=0\n"
 			"ro.telephony.default_network=10\n"
 			"telephony.lteOnCdmaDevice=1\n"
@@ -138,9 +166,10 @@ struct cpuinfo_mock_file filesystem[] = {
 			"persist.camera.eis.enable=1\n"
 			"persist.camera.is_type=4\n"
 			"dalvik.vm.boot-dex2oat-threads=4\n"
-			"dalvik.vm.dex2oat-threads=2\n"
+			"dalvik.vm.dex2oat-threads=4\n"
 			"dalvik.vm.image-dex2oat-threads=4\n"
 			"persist.radio.redir_party_num=0\n"
+			"ro.product.first_api_level=23\n"
 			"dalvik.vm.heapstartsize=8m\n"
 			"dalvik.vm.heapgrowthlimit=192m\n"
 			"dalvik.vm.heapsize=512m\n"
@@ -149,22 +178,21 @@ struct cpuinfo_mock_file filesystem[] = {
 			"dalvik.vm.heapmaxfree=8m\n"
 			"keyguard.no_require_sim=true\n"
 			"drm.service.enabled=true\n"
-			"ro.facelock.black_timeout=400\n"
-			"ro.facelock.det_timeout=1500\n"
-			"ro.facelock.rec_timeout=2500\n"
-			"ro.facelock.lively_timeout=2500\n"
+			"ro.setupwizard.rotation_locked=true\n"
+			"ro.facelock.black_timeout=700\n"
+			"ro.facelock.det_timeout=2500\n"
+			"ro.facelock.rec_timeout=3500\n"
 			"ro.facelock.est_max_time=600\n"
-			"ro.facelock.use_intro_anim=false\n"
-			"persist.sys.dalvik.vm.lib.2=libart\n"
+			"persist.sys.dalvik.vm.lib.2=libart.so\n"
 			"dalvik.vm.isa.arm64.variant=cortex-a53\n"
 			"dalvik.vm.isa.arm64.features=default\n"
-			"dalvik.vm.isa.arm.variant=cortex-a7\n"
+			"dalvik.vm.isa.arm.variant=cortex-a53.a57\n"
 			"dalvik.vm.isa.arm.features=default\n"
 			"net.bt.name=Android\n"
 			"dalvik.vm.stack-trace-file=/data/anr/traces.txt\n"
-			"ro.build.expect.bootloader=angler-03.52\n"
-			"ro.build.expect.baseband=angler-03.61\n"
-			"ro.expect.recovery_id=0x4529b1d7722a656849158a9584ad6193c5d55be0000000000000000000000000\n"
+			"ro.build.expect.bootloader=angler-03.68\n"
+			"ro.build.expect.baseband=angler-03.81\n"
+			"ro.expect.recovery_id=0xe0ffcc9788ff3d40010da368597592ca5492bd05000000000000000000000000\n"
 			"\n",
 	},
 	{
@@ -173,49 +201,49 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content = "7\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/possible",
-		.size = 4,
-		.content = "0-7\n",
+		.path = "/sys/devices/system/cpu/modalias",
+		.size = 66,
+		.content = "cpu:type:aarch64:feature:,0000,0001,0002,0003,0004,0005,0006,0007\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/present",
+		.path = "/sys/devices/system/cpu/offline",
 		.size = 4,
-		.content = "0-7\n",
+		.content = "4-7\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/online",
 		.size = 4,
-		.content = "0-7\n",
+		.content = "0-3\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/offline",
-		.size = 1,
-		.content = "\n",
+		.path = "/sys/devices/system/cpu/possible",
+		.size = 4,
+		.content = "0-7\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/modalias",
-		.size = 66,
-		.content = "cpu:type:aarch64:feature:,0000,0001,0002,0003,0004,0005,0006,0007\n",
+		.path = "/sys/devices/system/cpu/present",
+		.size = 4,
+		.content = "0-7\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpufreq/all_time_in_state",
-		.size = 705,
+		.size = 659,
 		.content =
 			"freq\t\tcpu0\t\tcpu1\t\tcpu2\t\tcpu3\t\tcpu4\t\tcpu5\t\tcpu6\t\tcpu7\t\t\n"
-			"384000\t\t7840\t\t0\t\t0\t\t0\t\t0\t\tN/A\t\tN/A\t\tN/A\t\t\n"
-			"480000\t\tN/A\t\tN/A\t\tN/A\t\tN/A\t\t0\t\tN/A\t\tN/A\t\tN/A\t\t\n"
-			"633600\t\tN/A\t\tN/A\t\tN/A\t\tN/A\t\t11612\t\tN/A\t\tN/A\t\tN/A\t\t\n"
-			"768000\t\t33\t\t0\t\t0\t\t0\t\t86\t\tN/A\t\tN/A\t\tN/A\t\t\n"
-			"864000\t\t35\t\t0\t\t0\t\t0\t\t286\t\tN/A\t\tN/A\t\tN/A\t\t\n"
-			"960000\t\t252\t\t0\t\t0\t\t0\t\t111\t\tN/A\t\tN/A\t\tN/A\t\t\n"
-			"1248000\t\t493\t\t0\t\t0\t\t0\t\t286\t\tN/A\t\tN/A\t\tN/A\t\t\n"
-			"1344000\t\t117\t\t0\t\t0\t\t0\t\t20\t\tN/A\t\tN/A\t\tN/A\t\t\n"
-			"1440000\t\tN/A\t\tN/A\t\tN/A\t\tN/A\t\t57\t\tN/A\t\tN/A\t\tN/A\t\t\n"
-			"1536000\t\tN/A\t\tN/A\t\tN/A\t\tN/A\t\t108\t\tN/A\t\tN/A\t\tN/A\t\t\n"
-			"1632000\t\tN/A\t\tN/A\t\tN/A\t\tN/A\t\t15\t\tN/A\t\tN/A\t\tN/A\t\t\n"
-			"1728000\t\tN/A\t\tN/A\t\tN/A\t\tN/A\t\t21\t\tN/A\t\tN/A\t\tN/A\t\t\n"
-			"1824000\t\tN/A\t\tN/A\t\tN/A\t\tN/A\t\t99\t\tN/A\t\tN/A\t\tN/A\t\t\n"
-			"1958400\t\tN/A\t\tN/A\t\tN/A\t\tN/A\t\t1212\t\tN/A\t\tN/A\t\tN/A\t\t\n",
+			"384000\t\t28047\t\t0\t\t0\t\t0\t\t0\t\tN/A\t\tN/A\t\t0\t\t\n"
+			"480000\t\tN/A\t\tN/A\t\tN/A\t\tN/A\t\t0\t\tN/A\t\tN/A\t\t0\t\t\n"
+			"633600\t\tN/A\t\tN/A\t\tN/A\t\tN/A\t\t0\t\tN/A\t\tN/A\t\t0\t\t\n"
+			"768000\t\t66\t\t0\t\t0\t\t0\t\t10\t\tN/A\t\tN/A\t\t0\t\t\n"
+			"864000\t\t70\t\t0\t\t0\t\t0\t\t0\t\tN/A\t\tN/A\t\t0\t\t\n"
+			"960000\t\t378\t\t0\t\t0\t\t0\t\t0\t\tN/A\t\tN/A\t\t0\t\t\n"
+			"1248000\t\t3074\t\t0\t\t0\t\t0\t\t0\t\tN/A\t\tN/A\t\t0\t\t\n"
+			"1344000\t\t572\t\t0\t\t0\t\t0\t\t0\t\tN/A\t\tN/A\t\t0\t\t\n"
+			"1440000\t\tN/A\t\tN/A\t\tN/A\t\tN/A\t\t0\t\tN/A\t\tN/A\t\t0\t\t\n"
+			"1536000\t\tN/A\t\tN/A\t\tN/A\t\tN/A\t\t0\t\tN/A\t\tN/A\t\t0\t\t\n"
+			"1632000\t\tN/A\t\tN/A\t\tN/A\t\tN/A\t\t0\t\tN/A\t\tN/A\t\t0\t\t\n"
+			"1728000\t\tN/A\t\tN/A\t\tN/A\t\tN/A\t\t0\t\tN/A\t\tN/A\t\t0\t\t\n"
+			"1824000\t\tN/A\t\tN/A\t\tN/A\t\tN/A\t\t0\t\tN/A\t\tN/A\t\t0\t\t\n"
+			"1958400\t\tN/A\t\tN/A\t\tN/A\t\tN/A\t\t0\t\tN/A\t\tN/A\t\t0\t\t\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpufreq/current_in_state",
@@ -241,6 +269,11 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content = "null\n",
 	},
 	{
+		.path = "/sys/devices/system/cpu/cpu0/cpuidle/driver/name",
+		.size = 9,
+		.content = "msm_idle\n",
+	},
+	{
 		.path = "/sys/devices/system/cpu/cpu0/cpufreq/affected_cpus",
 		.size = 8,
 		.content = "0 1 2 3\n",
@@ -297,47 +330,42 @@ struct cpuinfo_mock_file filesystem[] = {
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu0/cpufreq/stats/time_in_state",
-		.size = 122,
+		.size = 126,
 		.content =
-			"384000 7940\n"
-			"460800 279\n"
-			"600000 86\n"
-			"672000 38\n"
-			"768000 33\n"
-			"864000 35\n"
-			"960000 252\n"
-			"1248000 493\n"
-			"1344000 117\n"
-			"1478400 24\n"
-			"1555200 4934\n",
+			"384000 28193\n"
+			"460800 226\n"
+			"600000 173\n"
+			"672000 58\n"
+			"768000 66\n"
+			"864000 70\n"
+			"960000 378\n"
+			"1248000 3074\n"
+			"1344000 572\n"
+			"1478400 199\n"
+			"1555200 7711\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu0/cpufreq/stats/total_trans",
 		.size = 4,
-		.content = "295\n",
+		.content = "595\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu0/topology/physical_package_id",
+		.path = "/sys/devices/system/cpu/cpu0/topology/core_id",
 		.size = 2,
 		.content = "0\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu0/topology/core_siblings_list",
-		.size = 4,
-		.content = "0-3\n",
-	},
-	{
 		.path = "/sys/devices/system/cpu/cpu0/topology/core_siblings",
 		.size = 3,
 		.content = "0f\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu0/topology/core_id",
-		.size = 2,
-		.content = "0\n",
+		.path = "/sys/devices/system/cpu/cpu0/topology/core_siblings_list",
+		.size = 4,
+		.content = "0-3\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu0/topology/thread_siblings_list",
+		.path = "/sys/devices/system/cpu/cpu0/topology/physical_package_id",
 		.size = 2,
 		.content = "0\n",
 	},
@@ -347,6 +375,16 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content = "01\n",
 	},
 	{
+		.path = "/sys/devices/system/cpu/cpu0/topology/thread_siblings_list",
+		.size = 2,
+		.content = "0\n",
+	},
+	{
+		.path = "/sys/devices/system/cpu/cpu1/cpuidle/driver/name",
+		.size = 9,
+		.content = "msm_idle\n",
+	},
+	{
 		.path = "/sys/devices/system/cpu/cpu1/cpufreq/affected_cpus",
 		.size = 8,
 		.content = "0 1 2 3\n",
@@ -403,29 +441,34 @@ struct cpuinfo_mock_file filesystem[] = {
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu1/cpufreq/stats/time_in_state",
-		.size = 122,
+		.size = 126,
 		.content =
-			"384000 8223\n"
-			"460800 279\n"
-			"600000 86\n"
-			"672000 38\n"
-			"768000 33\n"
-			"864000 35\n"
-			"960000 252\n"
-			"1248000 493\n"
-			"1344000 117\n"
-			"1478400 24\n"
-			"1555200 4934\n",
+			"384000 28473\n"
+			"460800 226\n"
+			"600000 173\n"
+			"672000 58\n"
+			"768000 66\n"
+			"864000 70\n"
+			"960000 378\n"
+			"1248000 3074\n"
+			"1344000 572\n"
+			"1478400 199\n"
+			"1555200 7711\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu1/cpufreq/stats/total_trans",
 		.size = 4,
-		.content = "295\n",
+		.content = "595\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu1/topology/physical_package_id",
+		.path = "/sys/devices/system/cpu/cpu1/topology/core_id",
 		.size = 2,
-		.content = "0\n",
+		.content = "1\n",
+	},
+	{
+		.path = "/sys/devices/system/cpu/cpu1/topology/core_siblings",
+		.size = 3,
+		.content = "0f\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu1/topology/core_siblings_list",
@@ -433,14 +476,14 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content = "0-3\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu1/topology/core_siblings",
-		.size = 3,
-		.content = "0f\n",
+		.path = "/sys/devices/system/cpu/cpu1/topology/physical_package_id",
+		.size = 2,
+		.content = "0\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu1/topology/core_id",
-		.size = 2,
-		.content = "1\n",
+		.path = "/sys/devices/system/cpu/cpu1/topology/thread_siblings",
+		.size = 3,
+		.content = "02\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu1/topology/thread_siblings_list",
@@ -448,9 +491,9 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content = "1\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu1/topology/thread_siblings",
-		.size = 3,
-		.content = "02\n",
+		.path = "/sys/devices/system/cpu/cpu2/cpuidle/driver/name",
+		.size = 9,
+		.content = "msm_idle\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu2/cpufreq/affected_cpus",
@@ -509,29 +552,34 @@ struct cpuinfo_mock_file filesystem[] = {
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu2/cpufreq/stats/time_in_state",
-		.size = 122,
+		.size = 126,
 		.content =
-			"384000 8497\n"
-			"460800 279\n"
-			"600000 92\n"
-			"672000 38\n"
-			"768000 33\n"
-			"864000 35\n"
-			"960000 252\n"
-			"1248000 493\n"
-			"1344000 117\n"
-			"1478400 24\n"
-			"1555200 4934\n",
+			"384000 28764\n"
+			"460800 226\n"
+			"600000 173\n"
+			"672000 58\n"
+			"768000 66\n"
+			"864000 70\n"
+			"960000 378\n"
+			"1248000 3074\n"
+			"1344000 572\n"
+			"1478400 199\n"
+			"1555200 7711\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu2/cpufreq/stats/total_trans",
 		.size = 4,
-		.content = "297\n",
+		.content = "595\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu2/topology/physical_package_id",
+		.path = "/sys/devices/system/cpu/cpu2/topology/core_id",
 		.size = 2,
-		.content = "0\n",
+		.content = "2\n",
+	},
+	{
+		.path = "/sys/devices/system/cpu/cpu2/topology/core_siblings",
+		.size = 3,
+		.content = "0f\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu2/topology/core_siblings_list",
@@ -539,14 +587,14 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content = "0-3\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu2/topology/core_siblings",
-		.size = 3,
-		.content = "0f\n",
+		.path = "/sys/devices/system/cpu/cpu2/topology/physical_package_id",
+		.size = 2,
+		.content = "0\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu2/topology/core_id",
-		.size = 2,
-		.content = "2\n",
+		.path = "/sys/devices/system/cpu/cpu2/topology/thread_siblings",
+		.size = 3,
+		.content = "04\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu2/topology/thread_siblings_list",
@@ -554,9 +602,9 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content = "2\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu2/topology/thread_siblings",
-		.size = 3,
-		.content = "04\n",
+		.path = "/sys/devices/system/cpu/cpu3/cpuidle/driver/name",
+		.size = 9,
+		.content = "msm_idle\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu3/cpufreq/affected_cpus",
@@ -615,39 +663,24 @@ struct cpuinfo_mock_file filesystem[] = {
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu3/cpufreq/stats/time_in_state",
-		.size = 122,
+		.size = 126,
 		.content =
-			"384000 8783\n"
-			"460800 279\n"
-			"600000 92\n"
-			"672000 38\n"
-			"768000 33\n"
-			"864000 35\n"
-			"960000 252\n"
-			"1248000 493\n"
-			"1344000 117\n"
-			"1478400 24\n"
-			"1555200 4934\n",
+			"384000 29036\n"
+			"460800 226\n"
+			"600000 173\n"
+			"672000 58\n"
+			"768000 66\n"
+			"864000 70\n"
+			"960000 378\n"
+			"1248000 3074\n"
+			"1344000 572\n"
+			"1478400 199\n"
+			"1555200 7711\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu3/cpufreq/stats/total_trans",
 		.size = 4,
-		.content = "297\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu3/topology/physical_package_id",
-		.size = 2,
-		.content = "0\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu3/topology/core_siblings_list",
-		.size = 4,
-		.content = "0-3\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu3/topology/core_siblings",
-		.size = 3,
-		.content = "0f\n",
+		.content = "595\n",
 	},
 	{
 		.path = "/sys/devices/system/cpu/cpu3/topology/core_id",
@@ -655,474 +688,52 @@ struct cpuinfo_mock_file filesystem[] = {
 		.content = "3\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu3/topology/thread_siblings_list",
-		.size = 2,
-		.content = "3\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu3/topology/thread_siblings",
-		.size = 3,
-		.content = "08\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu4/cpufreq/affected_cpus",
-		.size = 8,
-		.content = "4 5 6 7\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu4/cpufreq/cpuinfo_max_freq",
-		.size = 8,
-		.content = "1958400\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu4/cpufreq/cpuinfo_min_freq",
-		.size = 7,
-		.content = "384000\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu4/cpufreq/cpuinfo_transition_latency",
-		.size = 2,
-		.content = "0\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu4/cpufreq/related_cpus",
-		.size = 8,
-		.content = "4 5 6 7\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu4/cpufreq/scaling_available_frequencies",
-		.size = 107,
-		.content = "384000 480000 633600 768000 864000 960000 1248000 1344000 1440000 1536000 1632000 1728000 1824000 1958400 \n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu4/cpufreq/scaling_available_governors",
-		.size = 54,
-		.content = "interactive ondemand userspace powersave performance \n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu4/cpufreq/scaling_cur_freq",
-		.size = 7,
-		.content = "633600\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu4/cpufreq/scaling_driver",
-		.size = 4,
-		.content = "msm\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu4/cpufreq/scaling_governor",
-		.size = 12,
-		.content = "interactive\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq",
-		.size = 8,
-		.content = "1958400\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu4/cpufreq/scaling_min_freq",
-		.size = 7,
-		.content = "633600\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu4/cpufreq/stats/time_in_state",
-		.size = 155,
-		.content =
-			"384000 0\n"
-			"480000 0\n"
-			"633600 12842\n"
-			"768000 86\n"
-			"864000 286\n"
-			"960000 111\n"
-			"1248000 286\n"
-			"1344000 20\n"
-			"1440000 57\n"
-			"1536000 108\n"
-			"1632000 15\n"
-			"1728000 21\n"
-			"1824000 99\n"
-			"1958400 1212\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu4/cpufreq/stats/total_trans",
-		.size = 4,
-		.content = "267\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu4/topology/physical_package_id",
-		.size = 2,
-		.content = "1\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu4/topology/core_siblings_list",
-		.size = 4,
-		.content = "4-7\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu4/topology/core_siblings",
-		.size = 3,
-		.content = "f0\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu4/topology/core_id",
-		.size = 2,
-		.content = "0\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu4/topology/thread_siblings_list",
-		.size = 2,
-		.content = "4\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu4/topology/thread_siblings",
+		.path = "/sys/devices/system/cpu/cpu3/topology/core_siblings",
 		.size = 3,
-		.content = "10\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu5/cpufreq/affected_cpus",
-		.size = 8,
-		.content = "4 5 6 7\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu5/cpufreq/cpuinfo_max_freq",
-		.size = 8,
-		.content = "1958400\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu5/cpufreq/cpuinfo_min_freq",
-		.size = 7,
-		.content = "384000\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu5/cpufreq/cpuinfo_transition_latency",
-		.size = 2,
-		.content = "0\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu5/cpufreq/related_cpus",
-		.size = 8,
-		.content = "4 5 6 7\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu5/cpufreq/scaling_available_frequencies",
-		.size = 107,
-		.content = "384000 480000 633600 768000 864000 960000 1248000 1344000 1440000 1536000 1632000 1728000 1824000 1958400 \n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu5/cpufreq/scaling_available_governors",
-		.size = 54,
-		.content = "interactive ondemand userspace powersave performance \n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu5/cpufreq/scaling_cur_freq",
-		.size = 7,
-		.content = "633600\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu5/cpufreq/scaling_driver",
-		.size = 4,
-		.content = "msm\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu5/cpufreq/scaling_governor",
-		.size = 12,
-		.content = "interactive\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu5/cpufreq/scaling_max_freq",
-		.size = 8,
-		.content = "1958400\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu5/cpufreq/scaling_min_freq",
-		.size = 7,
-		.content = "633600\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu5/cpufreq/stats/time_in_state",
-		.size = 155,
-		.content =
-			"384000 0\n"
-			"480000 0\n"
-			"633600 13125\n"
-			"768000 86\n"
-			"864000 286\n"
-			"960000 111\n"
-			"1248000 286\n"
-			"1344000 20\n"
-			"1440000 57\n"
-			"1536000 108\n"
-			"1632000 15\n"
-			"1728000 21\n"
-			"1824000 99\n"
-			"1958400 1212\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu5/cpufreq/stats/total_trans",
-		.size = 4,
-		.content = "267\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu5/topology/physical_package_id",
-		.size = 2,
-		.content = "1\n",
+		.content = "0f\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu5/topology/core_siblings_list",
+		.path = "/sys/devices/system/cpu/cpu3/topology/core_siblings_list",
 		.size = 4,
-		.content = "4-7\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu5/topology/core_siblings",
-		.size = 3,
-		.content = "f0\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu5/topology/core_id",
-		.size = 2,
-		.content = "1\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu5/topology/thread_siblings_list",
-		.size = 2,
-		.content = "5\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu5/topology/thread_siblings",
-		.size = 3,
-		.content = "20\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu6/cpufreq/affected_cpus",
-		.size = 8,
-		.content = "4 5 6 7\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu6/cpufreq/cpuinfo_max_freq",
-		.size = 8,
-		.content = "1958400\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu6/cpufreq/cpuinfo_min_freq",
-		.size = 7,
-		.content = "384000\n",
+		.content = "0-3\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu6/cpufreq/cpuinfo_transition_latency",
+		.path = "/sys/devices/system/cpu/cpu3/topology/physical_package_id",
 		.size = 2,
 		.content = "0\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu6/cpufreq/related_cpus",
-		.size = 8,
-		.content = "4 5 6 7\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu6/cpufreq/scaling_available_frequencies",
-		.size = 107,
-		.content = "384000 480000 633600 768000 864000 960000 1248000 1344000 1440000 1536000 1632000 1728000 1824000 1958400 \n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu6/cpufreq/scaling_available_governors",
-		.size = 54,
-		.content = "interactive ondemand userspace powersave performance \n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu6/cpufreq/scaling_cur_freq",
-		.size = 7,
-		.content = "633600\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu6/cpufreq/scaling_driver",
-		.size = 4,
-		.content = "msm\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu6/cpufreq/scaling_governor",
-		.size = 12,
-		.content = "interactive\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu6/cpufreq/scaling_max_freq",
-		.size = 8,
-		.content = "1958400\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu6/cpufreq/scaling_min_freq",
-		.size = 7,
-		.content = "633600\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu6/cpufreq/stats/time_in_state",
-		.size = 155,
-		.content =
-			"384000 0\n"
-			"480000 0\n"
-			"633600 13413\n"
-			"768000 86\n"
-			"864000 286\n"
-			"960000 111\n"
-			"1248000 286\n"
-			"1344000 20\n"
-			"1440000 57\n"
-			"1536000 108\n"
-			"1632000 15\n"
-			"1728000 21\n"
-			"1824000 99\n"
-			"1958400 1212\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu6/cpufreq/stats/total_trans",
-		.size = 4,
-		.content = "267\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu6/topology/physical_package_id",
-		.size = 2,
-		.content = "1\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu6/topology/core_siblings_list",
-		.size = 4,
-		.content = "4-7\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu6/topology/core_siblings",
-		.size = 3,
-		.content = "f0\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu6/topology/core_id",
-		.size = 2,
-		.content = "2\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu6/topology/thread_siblings_list",
-		.size = 2,
-		.content = "6\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu6/topology/thread_siblings",
+		.path = "/sys/devices/system/cpu/cpu3/topology/thread_siblings",
 		.size = 3,
-		.content = "40\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu7/cpufreq/affected_cpus",
-		.size = 8,
-		.content = "4 5 6 7\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu7/cpufreq/cpuinfo_max_freq",
-		.size = 8,
-		.content = "1958400\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu7/cpufreq/cpuinfo_min_freq",
-		.size = 7,
-		.content = "384000\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu7/cpufreq/cpuinfo_transition_latency",
-		.size = 2,
-		.content = "0\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu7/cpufreq/related_cpus",
-		.size = 8,
-		.content = "4 5 6 7\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu7/cpufreq/scaling_available_frequencies",
-		.size = 107,
-		.content = "384000 480000 633600 768000 864000 960000 1248000 1344000 1440000 1536000 1632000 1728000 1824000 1958400 \n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu7/cpufreq/scaling_available_governors",
-		.size = 54,
-		.content = "interactive ondemand userspace powersave performance \n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu7/cpufreq/scaling_cur_freq",
-		.size = 7,
-		.content = "633600\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu7/cpufreq/scaling_driver",
-		.size = 4,
-		.content = "msm\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu7/cpufreq/scaling_governor",
-		.size = 12,
-		.content = "interactive\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu7/cpufreq/scaling_max_freq",
-		.size = 8,
-		.content = "1958400\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu7/cpufreq/scaling_min_freq",
-		.size = 7,
-		.content = "633600\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu7/cpufreq/stats/time_in_state",
-		.size = 155,
-		.content =
-			"384000 0\n"
-			"480000 0\n"
-			"633600 13694\n"
-			"768000 86\n"
-			"864000 286\n"
-			"960000 111\n"
-			"1248000 286\n"
-			"1344000 20\n"
-			"1440000 57\n"
-			"1536000 108\n"
-			"1632000 15\n"
-			"1728000 21\n"
-			"1824000 99\n"
-			"1958400 1212\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu7/cpufreq/stats/total_trans",
-		.size = 4,
-		.content = "267\n",
+		.content = "08\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu7/topology/physical_package_id",
+		.path = "/sys/devices/system/cpu/cpu3/topology/thread_siblings_list",
 		.size = 2,
-		.content = "1\n",
-	},
-	{
-		.path = "/sys/devices/system/cpu/cpu7/topology/core_siblings_list",
-		.size = 4,
-		.content = "4-7\n",
+		.content = "3\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu7/topology/core_siblings",
-		.size = 3,
-		.content = "f0\n",
+		.path = "/sys/devices/system/cpu/cpu4/cpuidle/driver/name",
+		.size = 9,
+		.content = "msm_idle\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu7/topology/core_id",
-		.size = 2,
-		.content = "3\n",
+		.path = "/sys/devices/system/cpu/cpu5/cpuidle/driver/name",
+		.size = 9,
+		.content = "msm_idle\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu7/topology/thread_siblings_list",
-		.size = 2,
-		.content = "7\n",
+		.path = "/sys/devices/system/cpu/cpu6/cpuidle/driver/name",
+		.size = 9,
+		.content = "msm_idle\n",
 	},
 	{
-		.path = "/sys/devices/system/cpu/cpu7/topology/thread_siblings",
-		.size = 3,
-		.content = "80\n",
+		.path = "/sys/devices/system/cpu/cpu7/cpuidle/driver/name",
+		.size = 9,
+		.content = "msm_idle\n",
 	},
 	{ NULL },
 };
-
 #ifdef __ANDROID__
 struct cpuinfo_mock_property properties[] = {
 	{
@@ -1134,6 +745,10 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "192",
 	},
 	{
+		.key = "dalvik.vm.appimageformat",
+		.value = "lz4",
+	},
+	{
 		.key = "dalvik.vm.boot-dex2oat-threads",
 		.value = "4",
 	},
@@ -1147,7 +762,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "dalvik.vm.dex2oat-threads",
-		.value = "2",
+		.value = "4",
 	},
 	{
 		.key = "dalvik.vm.heapgrowthlimit",
@@ -1191,7 +806,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "dalvik.vm.isa.arm.variant",
-		.value = "cortex-a7",
+		.value = "cortex-a53.a57",
 	},
 	{
 		.key = "dalvik.vm.isa.arm64.features",
@@ -1206,6 +821,14 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "/data/anr/traces.txt",
 	},
 	{
+		.key = "dalvik.vm.usejit",
+		.value = "true",
+	},
+	{
+		.key = "dalvik.vm.usejitprofiles",
+		.value = "true",
+	},
+	{
 		.key = "debug.atrace.tags.enableflags",
 		.value = "0",
 	},
@@ -1263,25 +886,13 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "gsm.version.baseband",
-		.value = "angler-03.61",
+		.value = "angler-03.81",
 	},
 	{
 		.key = "gsm.version.ril-impl",
 		.value = "Qualcomm RIL 1.0",
 	},
 	{
-		.key = "hw.cabl.version",
-		.value = "1.1.20130401",
-	},
-	{
-		.key = "hw.cabl.yuv",
-		.value = "0",
-	},
-	{
-		.key = "hw.pp.cfg",
-		.value = "/data/misc/display/pp_data.cfg",
-	},
-	{
 		.key = "init.svc.InputEventFind",
 		.value = "stopped",
 	},
@@ -1294,10 +905,22 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "running",
 	},
 	{
+		.key = "init.svc.audioserver",
+		.value = "running",
+	},
+	{
 		.key = "init.svc.bootanim",
 		.value = "stopped",
 	},
 	{
+		.key = "init.svc.cameraserver",
+		.value = "running",
+	},
+	{
+		.key = "init.svc.clear-bcb",
+		.value = "stopped",
+	},
+	{
 		.key = "init.svc.cnd",
 		.value = "running",
 	},
@@ -1310,10 +933,6 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "running",
 	},
 	{
-		.key = "init.svc.defaultcrypto",
-		.value = "stopped",
-	},
-	{
 		.key = "init.svc.drm",
 		.value = "running",
 	},
@@ -1322,7 +941,7 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "running",
 	},
 	{
-		.key = "init.svc.flash-sh-fw",
+		.key = "init.svc.flash-nanohub-fw",
 		.value = "stopped",
 	},
 	{
@@ -1386,6 +1005,18 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "running",
 	},
 	{
+		.key = "init.svc.mediacodec",
+		.value = "running",
+	},
+	{
+		.key = "init.svc.mediadrm",
+		.value = "running",
+	},
+	{
+		.key = "init.svc.mediaextractor",
+		.value = "running",
+	},
+	{
 		.key = "init.svc.msm_irqbalance",
 		.value = "running",
 	},
@@ -1418,10 +1049,6 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "running",
 	},
 	{
-		.key = "init.svc.ppd",
-		.value = "running",
-	},
-	{
 		.key = "init.svc.qcamerasvr",
 		.value = "running",
 	},
@@ -1438,6 +1065,10 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "running",
 	},
 	{
+		.key = "init.svc.radio-sh",
+		.value = "stopped",
+	},
+	{
 		.key = "init.svc.ril-daemon",
 		.value = "running",
 	},
@@ -1495,11 +1126,15 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "net.change",
-		.value = "net.qtaguid_enabled",
+		.value = "net.lte.ims.data.enabled",
 	},
 	{
 		.key = "net.hostname",
-		.value = "android-316c987660ec3172",
+		.value = "android-51efb26cb84d8dad",
+	},
+	{
+		.key = "net.lte.ims.data.enabled",
+		.value = "true",
 	},
 	{
 		.key = "net.qtaguid_enabled",
@@ -1643,11 +1278,51 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "persist.sys.usb.config",
-		.value = "mtp,adb",
+		.value = "adb",
+	},
+	{
+		.key = "persist.sys.webview.vmsize",
+		.value = "116905264",
+	},
+	{
+		.key = "pm.dexopt.ab-ota",
+		.value = "speed-profile",
+	},
+	{
+		.key = "pm.dexopt.bg-dexopt",
+		.value = "speed-profile",
+	},
+	{
+		.key = "pm.dexopt.boot",
+		.value = "verify-profile",
+	},
+	{
+		.key = "pm.dexopt.core-app",
+		.value = "speed",
+	},
+	{
+		.key = "pm.dexopt.first-boot",
+		.value = "interpret-only",
+	},
+	{
+		.key = "pm.dexopt.forced-dexopt",
+		.value = "speed",
+	},
+	{
+		.key = "pm.dexopt.install",
+		.value = "interpret-only",
+	},
+	{
+		.key = "pm.dexopt.nsys-library",
+		.value = "speed",
+	},
+	{
+		.key = "pm.dexopt.shared-apk",
+		.value = "speed",
 	},
 	{
 		.key = "ril.ecclist",
-		.value = "112,911",
+		.value = "112,911,999",
 	},
 	{
 		.key = "ril.qcril_pre_init_lock_held",
@@ -1655,7 +1330,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "rild.libpath",
-		.value = "/system/vendor/lib64/libril-qc-qmi-1.so",
+		.value = "/vendor/lib64/libril-qc-qmi-1.so",
 	},
 	{
 		.key = "ro.adb.secure",
@@ -1666,6 +1341,10 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "0",
 	},
 	{
+		.key = "ro.atrace.core.services",
+		.value = "com.google.android.gms,com.google.android.gms.ui,com.google.android.gms.persistent",
+	},
+	{
 		.key = "ro.audio.flinger_standbytime_ms",
 		.value = "300",
 	},
@@ -1695,7 +1374,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.boot.bootloader",
-		.value = "angler-03.52",
+		.value = "angler-03.68",
 	},
 	{
 		.key = "ro.boot.bootreason",
@@ -1703,23 +1382,27 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.boot.btmacaddr",
-		.value = "DC:D9:16:55:5A:1B",
+		.value = "AC:CF:85:6B:AA:47",
 	},
 	{
 		.key = "ro.boot.console",
 		.value = "ttyHSL0",
 	},
 	{
+		.key = "ro.boot.flash.locked",
+		.value = "1",
+	},
+	{
 		.key = "ro.boot.hardware",
 		.value = "angler",
 	},
 	{
 		.key = "ro.boot.hardware.ddr",
-		.value = "3072MB,SAMSUNG,LPDDR4",
+		.value = "3072MB,MICRON,LPDDR4",
 	},
 	{
 		.key = "ro.boot.hardware.emmc",
-		.value = "64GB,Toshiba",
+		.value = "64GB,Samsung",
 	},
 	{
 		.key = "ro.boot.hardware.revision",
@@ -1735,7 +1418,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.boot.radio",
-		.value = "angler-03.61",
+		.value = "angler-03.81",
 	},
 	{
 		.key = "ro.boot.secure_hardware",
@@ -1743,7 +1426,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.boot.serialno",
-		.value = "8XV7N16630000342",
+		.value = "8XV5T15A20014739",
 	},
 	{
 		.key = "ro.boot.verifiedbootstate",
@@ -1763,23 +1446,23 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.boot.wifimacaddr",
-		.value = "DC:D9:16:55:58:8B",
+		.value = "AC:CF:85:6B:9C:37",
 	},
 	{
 		.key = "ro.bootimage.build.date",
-		.value = "Thu Jun 9 19:02:30 UTC 2016",
+		.value = "Mon Mar 27 18:32:57 UTC 2017",
 	},
 	{
 		.key = "ro.bootimage.build.date.utc",
-		.value = "1465498950",
+		.value = "1490639577",
 	},
 	{
 		.key = "ro.bootimage.build.fingerprint",
-		.value = "google/angler/angler:6.0.1/MTC19X/2960136:user/release-keys",
+		.value = "google/angler/angler:7.1.2/N2G47O/3852959:user/release-keys",
 	},
 	{
 		.key = "ro.bootloader",
-		.value = "angler-03.52",
+		.value = "angler-03.68",
 	},
 	{
 		.key = "ro.bootmode",
@@ -1791,31 +1474,31 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.build.date",
-		.value = "Thu Jun  9 18:58:55 UTC 2016",
+		.value = "Mon Mar 27 18:32:57 UTC 2017",
 	},
 	{
 		.key = "ro.build.date.utc",
-		.value = "1465498735",
+		.value = "1490639577",
 	},
 	{
 		.key = "ro.build.description",
-		.value = "angler-user 6.0.1 MTC19X 2960136 release-keys",
+		.value = "angler-user 7.1.2 N2G47O 3852959 release-keys",
 	},
 	{
 		.key = "ro.build.display.id",
-		.value = "MTC19X",
+		.value = "N2G47O",
 	},
 	{
 		.key = "ro.build.expect.baseband",
-		.value = "angler-03.61",
+		.value = "angler-03.81",
 	},
 	{
 		.key = "ro.build.expect.bootloader",
-		.value = "angler-03.52",
+		.value = "angler-03.68",
 	},
 	{
 		.key = "ro.build.fingerprint",
-		.value = "google/angler/angler:6.0.1/MTC19X/2960136:user/release-keys",
+		.value = "google/angler/angler:7.1.2/N2G47O/3852959:user/release-keys",
 	},
 	{
 		.key = "ro.build.flavor",
@@ -1823,11 +1506,11 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.build.host",
-		.value = "vpef9.mtv.corp.google.com",
+		.value = "vped7.mtv.corp.google.com",
 	},
 	{
 		.key = "ro.build.id",
-		.value = "MTC19X",
+		.value = "N2G47O",
 	},
 	{
 		.key = "ro.build.product",
@@ -1859,23 +1542,23 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.build.version.incremental",
-		.value = "2960136",
+		.value = "3852959",
 	},
 	{
 		.key = "ro.build.version.preview_sdk",
-		.value = "",
+		.value = "0",
 	},
 	{
 		.key = "ro.build.version.release",
-		.value = "6.0.1",
+		.value = "7.1.2",
 	},
 	{
 		.key = "ro.build.version.sdk",
-		.value = "23",
+		.value = "25",
 	},
 	{
 		.key = "ro.build.version.security_patch",
-		.value = "2016-07-05",
+		.value = "2017-05-05",
 	},
 	{
 		.key = "ro.carrier",
@@ -1886,6 +1569,10 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "false",
 	},
 	{
+		.key = "ro.com.android.prov_mobiledata",
+		.value = "false",
+	},
+	{
 		.key = "ro.com.android.wifi-watchlist",
 		.value = "GoogleGuest",
 	},
@@ -1931,31 +1618,23 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.expect.recovery_id",
-		.value = "0x4529b1d7722a656849158a9584ad6193c5d55be0000000000000000000000000",
+		.value = "0xe0ffcc9788ff3d40010da368597592ca5492bd05000000000000000000000000",
 	},
 	{
 		.key = "ro.facelock.black_timeout",
-		.value = "400",
+		.value = "700",
 	},
 	{
 		.key = "ro.facelock.det_timeout",
-		.value = "1500",
+		.value = "2500",
 	},
 	{
 		.key = "ro.facelock.est_max_time",
 		.value = "600",
 	},
 	{
-		.key = "ro.facelock.lively_timeout",
-		.value = "2500",
-	},
-	{
 		.key = "ro.facelock.rec_timeout",
-		.value = "2500",
-	},
-	{
-		.key = "ro.facelock.use_intro_anim",
-		.value = "false",
+		.value = "3500",
 	},
 	{
 		.key = "ro.frp.pst",
@@ -2018,8 +1697,12 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "384000",
 	},
 	{
+		.key = "ro.oem_unlock_supported",
+		.value = "1",
+	},
+	{
 		.key = "ro.opengles.version",
-		.value = "196609",
+		.value = "196610",
 	},
 	{
 		.key = "ro.product.board",
@@ -2050,6 +1733,10 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "angler",
 	},
 	{
+		.key = "ro.product.first_api_level",
+		.value = "23",
+	},
+	{
 		.key = "ro.product.locale",
 		.value = "en-US",
 	},
@@ -2071,7 +1758,11 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.recovery_id",
-		.value = "0xc21a379d1ba7089acb138beb1811ce36bc469896000000000000000000000000",
+		.value = "0xd6b94a97eea9b48cd5d39cb9941213964057df4d000000000000000000000000",
+	},
+	{
+		.key = "ro.retaildemo.video_path",
+		.value = "/data/preloads/demo/retail_demo.mp4",
 	},
 	{
 		.key = "ro.revision",
@@ -2087,7 +1778,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.runtime.firstboot",
-		.value = "1470866897567",
+		.value = "1463547108428",
 	},
 	{
 		.key = "ro.secure",
@@ -2095,13 +1786,17 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.serialno",
-		.value = "8XV7N16630000342",
+		.value = "8XV5T15A20014739",
 	},
 	{
 		.key = "ro.setupwizard.enterprise_mode",
 		.value = "1",
 	},
 	{
+		.key = "ro.setupwizard.rotation_locked",
+		.value = "true",
+	},
+	{
 		.key = "ro.sf.lcd_density",
 		.value = "560",
 	},
@@ -2127,15 +1822,15 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "ro.vendor.build.date",
-		.value = "Thu Jun 9 19:16:03 UTC 2016",
+		.value = "Mon Mar 27 18:32:57 UTC 2017",
 	},
 	{
 		.key = "ro.vendor.build.date.utc",
-		.value = "1465499763",
+		.value = "1490639577",
 	},
 	{
 		.key = "ro.vendor.build.fingerprint",
-		.value = "google/angler/angler:6.0.1/MTC19X/2960136:user/release-keys",
+		.value = "google/angler/angler:7.1.2/N2G47O/3852959:user/release-keys",
 	},
 	{
 		.key = "ro.vendor.extension_library",
@@ -2150,12 +1845,12 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "zygote64_32",
 	},
 	{
-		.key = "selinux.reload_policy",
+		.key = "security.perf_harden",
 		.value = "1",
 	},
 	{
-		.key = "sensors.contexthub.lid_state",
-		.value = "open",
+		.key = "selinux.reload_policy",
+		.value = "1",
 	},
 	{
 		.key = "service.bootanim.exit",
@@ -2166,18 +1861,14 @@ struct cpuinfo_mock_property properties[] = {
 		.value = "1",
 	},
 	{
-		.key = "sys.ims.DATA_DAEMON_STATUS",
-		.value = "1",
+		.key = "sys.listeners.registered",
+		.value = "true",
 	},
 	{
-		.key = "sys.ims.QMI_DAEMON_STATUS",
+		.key = "sys.logbootcomplete",
 		.value = "1",
 	},
 	{
-		.key = "sys.listeners.registered",
-		.value = "true",
-	},
-	{
 		.key = "sys.oem_unlock_allowed",
 		.value = "0",
 	},
@@ -2187,7 +1878,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "sys.usb.config",
-		.value = "mtp,adb",
+		.value = "ptp,adb",
 	},
 	{
 		.key = "sys.usb.configfs",
@@ -2199,7 +1890,7 @@ struct cpuinfo_mock_property properties[] = {
 	},
 	{
 		.key = "sys.usb.state",
-		.value = "mtp,adb",
+		.value = "ptp,adb",
 	},
 	{
 		.key = "telephony.lteOnCdmaDevice",