Merge "Check DTB image size for boot image header version 2 and above" am: cd9b18f215
am: a19c7f1d3a

Change-Id: I1ac4fc529b9c57c8712c2ed32325a20f6f0dbb1d