Merge "binder: recovery variant does not use libandroid_runtime_vm_headers"