Merge "releasetools: Prepend 'ota-' to 'streaming-property-files'." am: 511f1b9e97
am: f0e13afd7f

Change-Id: Icd347b11b88985bdda164976fee412f31a39abfd