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

Change-Id: I30fb2f3cb2dd2d199b1c98d400598bb3d4a542fd