Merge "mkbootimg: extract to 'second' if size not 0" am: a3d394e9bb am: 9130f5c950
am: 189e4a7c26

Change-Id: I201c0bb709be7559a9fedd61ea2b0ae8a91afa95