Merge "releasetools: allow for multiple OEM property values."
am: 9a3049d681

Change-Id: Icb67fdcf5f81c9169ce7316e3e483a86f884d743