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

Change-Id: I63ae03b416cb29f1e1efb8fc38af611946ad0385