Merge "Make libadf, libsync_recovery recovery_available."
am: ba22102ce3

Change-Id: I45e5b40128edff3623b2ee0c918e17b4ea93fa74