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

Change-Id: I97986706c01bdb61b47a43fc8411f9a7a345b003