Code sinking cleanups am: 5dd14cf9ab am: ceb1deed2a

Original change: https://android-review.googlesource.com/c/platform/art/+/2446502

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