Merge "Revert "libandroid_runtime_vm_headers is recovery_available."" am: d69e2b3f13 am: 65f0c883ff

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

Change-Id: I5ff5973c95868bee2b7444ecded7443d6e6429c9