am 48a27bcb: Merge "Fix OTA scripts to generate incremental BBOTA with OEM property."
am 48a27bcb: Merge "Fix OTA scripts to generate incremental BBOTA with OEM property."

* commit '48a27bcbb15774d0360fa344420a53cc72cd6708':
  Fix OTA scripts to generate incremental BBOTA with OEM property.

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build