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
am: fdbab23a98

Change-Id: I93109e88f395fb18e756af3fa74784b07b779fc4