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

Change-Id: Ia54d08b87b993c7aad6fba4d908d57d2ea22cbb5