Merge "Make libadf, libsync_recovery recovery_available."