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

Change-Id: Iac754f72903c38336d6af1aa5ba083889dda6ffb