Merge "add dtbo support for ota" am: 294d5c5f07
am: 793a9bb490

Change-Id: Ia44e579c6c642ca745aa7d38ce73d3c89dd9a0c8