Merge "Use cpu_number to index mapping" am: 528a67f89f am: ecd45d3dc2 am: 936dc69889 am: aa491db31a am: 00e2961eb9

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>