Merge "Add support for non-A/B OTA package in OTA_analysis."