am a0abf49d: resolved conflicts for a1fcaf86 to mnc-dr-dev

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