[automerger skipped] Merge "DO NOT MERGE: Fix signature of KernelCpuProcReader" into pi-dev am: 9457e1c429  -s ours
am: 285cd97730  -s ours

Change-Id: I24e0b3c66810cdf0cf360f81950f6d7df50a2013