Merge "Make libvintf recovery_available"