Merge "Use cpu_number to index mapping" am: 528a67f89f

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

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