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

Change-Id: Idc04bb8750cbb1a8aacdb006a41be0f15011328d