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

Change-Id: I6c5f8d6a0fe4ae72483e01b04a8a2be00ff62a15