Merge "DO NOT MERGE Revert "Revert "releasetools: Support OTAs that have OEM properties changes.""" into cw-f-dev am: fccf4ec06e am: a1980abe1f  -s ours
am: 2ad185af2a

Change-Id: Ib00c56c88f42150a7c65276c996a2e9f524ea0c9