Otapreopt: Implement new A/B OTA path am: d089ca1703 am: 7d14f10de3
am: 261fcb4c8b  -s ours

Change-Id: Ibaf74540839e87b9227a547fda737739e0ae283c