Merge "Mark libedify library as recovery_available." am: e3c7b067c8 am: 8de3a75e87

Change-Id: I508ad557bc9cef0f19c0727054edae49386eead3