am 3b409d56: am dae6455c: Merge "Add an option to include a full bootloader in incremental OTA."
am 3b409d56: am dae6455c: Merge "Add an option to include a full bootloader in incremental OTA."

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