Merge "binder: recovery variant does not use libandroid_runtime_vm_headers" am: fc34af194b am: 4da1edd272 am: fd7787fe2a am: 1639fde0a7

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1878016

Change-Id: I02ea43fca2a3c0df7b906cbf45fdcb32cf88cdd6