Code sinking cleanups am: 5dd14cf9ab

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

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