Merge "Drop the dependency on AB_OTA_UPDATER flag." am: 9fb0d89583
am: a855c33880

Change-Id: Iff00ea3ff120b4261406aa956e982d76f1be0f78