Merge "Mark libvold_headers as recovery_available." am: 4a13731f08 am: 51143b3555
am: 4ac5065a5d

Change-Id: If840402a01629d696da3592cb3330c1768d8dc12