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

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

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