Merge "Fix failing Libcore benchmarks." am: 9b62bec0 am: 0f38154c am: 6f60adb6 am: 8169ac1d

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



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