Merge "init: set ro.boot.avb_version in recovery mode" am: f1bd536efd
am: a1da077454

Change-Id: I277fa4c53e1f9669483fd01bed610eca0170de2c