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

Change-Id: Iff407b92a9bddc07ef43bf172fb84cb0da11bc0d