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

Change-Id: I42c47dd5f267b13d32b14efb186ecba63917e520