Merge "Make libvintf recovery_available" am: af0cefd66b am: 89630e0b45
am: 4e3780db08

Change-Id: Ie894e4318515fe644eead7770f95358815ce72e2