Merge "Revert "libandroid_runtime_vm_headers is recovery_available.""