Merge "Add BOARD_CUSTOM_BOOTIMG_MK for custom bootimg building"