DO NOT MERGE releasetools: allow for multiple OEM property values. am: 1c50b8154d
am: 4d57163b24  -s ours

Change-Id: I3494729a984359b7bce6e0cd91140c3f884d70f6