Merge "recovery_utils: Use libvoid_headers." am: 4782e79324 am: 7018c5b2d8
am: c1c275dd5c

Change-Id: I1b345bafba1b84449e41a03dffa0c468b0ad1ac4