am ffa5b081: am 89cd35ab: am fd5330c0: am 160603cf: am 5837f102: am 1753b4e9: resolved conflicts for 00fdede3 to lmp-mr1-ub-dev
am ffa5b081: am 89cd35ab: am fd5330c0: am 160603cf: am 5837f102: am 1753b4e9: resolved conflicts for 00fdede3 to lmp-mr1-ub-dev

* commit 'ffa5b081784c7c02cdb90bc2ddfd8bc8364034c7':
  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