Merge "hikey: hikey960: Add TARGET_BOOTLOADER_BOARD_NAME" am: 0ac1c5c5c4
am: 6b1e94ab2f

Change-Id: Ia7260a5f51b2193615a73266195bb217029ab3d7