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

Change-Id: I691ce751f4fc9534f2b6c22f86aa3f16958130eb