Merge "More robust read mechanism in KernelCpuProcReader" into pi-dev
am: f76c383f82

Change-Id: I6b70fbe607adb37a93d764615decfca243eff347