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: 132566628b  -s ours
am: 7db0ac5d38

Change-Id: I3d6b937b8131e2ac222f5b0d86c655f869b19a0d