Merge "Additional libcore benchmarks." am: e81851f57b am: e981334c62

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2067207

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