Merge "Make AVB work when BOARD_USES_RECOVERY_AS_BOOT is set to true."
am: 01bd1d34db

Change-Id: I38f97817667bb0ddcfa4d4142ded36d8e75940f6