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

Change-Id: I2f08d2ea41021e82aafab4c32851fd93e74d8fc8