DO NOT MERGE releasetools: allow for multiple OEM property values.
am: 1c50b8154d

Change-Id: Ibfc4cfb6e2b60687eac9e9475f86d904444f071a