Merge "Exclude OTA/bin tools when using A/B OTA updater"