Allow parsing boot image with header version 3 am: 9406118b6d

Change-Id: I39ea8c1db0eb6ec92b6ea3dd6869aa248f1a5c63