Merge "Use cpu_number to index mapping" am: 528a67f8 am: ecd45d3d am:...

Merge "Use cpu_number to index mapping" am: 528a67f8 am: ecd45d3d am: 936dc698 am: aa491db3 am: 00e2961e

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2579573



Change-Id: I58200cb72b71a505c5f69538f525ec8770751209
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>