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

Change-Id: I1260ea1bba7de40cb0f9a3661f281406f48cd708