am 1753b4e9: resolved conflicts for 00fdede3 to lmp-mr1-ub-dev
am 1753b4e9: resolved conflicts for 00fdede3 to lmp-mr1-ub-dev

* commit '1753b4e9e444d9ce57f5ce481ed5e3317670ee31':
  Add an option to include a full bootloader in incremental OTA.

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