Merge "Remove libandroid_runtime_vm_headers" am: 3bf2c7e4 am: b62d913c

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



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