Merge "Remove libandroid_runtime_vm_headers"