Merge "TARGET_RECOVERY_UPDATER_LIBS should not be used with AB updates"
am: 81648927fb

Change-Id: I34c35cdd94e2251109275de38520b7059529ee5a