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

Change-Id: I038243c757cfc755893f3d468da6498c1c67d2fd