Merge "Revert "libandroid_runtime_vm_headers is recovery_available."" am:...

Merge "Revert "libandroid_runtime_vm_headers is recovery_available."" am: d69e2b3f am: 65f0c883 am: d24e3c5c am: 6a667dcc am: 9eac3de6

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

Change-Id: I32d61555d8c1813a048451cb1531c20658427bfd