Merge "HiKey/HiKey960: Add BOARD_BOOTIMAGE_PARTITION_SIZE to make sure boot.img is created" am: 3574f5ad00
am: f1f49571d5

Change-Id: I297a35872546d84af9d4d3b15c6b1f4f7b6684b2