Android S V2 Beta 3
Merge "Replace TARGET_BOOTLOADER_BOARD_NAME with the value."