Merge "Mark libvold_headers as recovery_available."