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

Change-Id: I2ff401012f33571f9188fa796ee67cbff2a77776