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

Change-Id: I49bfdd94678badf9abcb4aee81471718d270cf85