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

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



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