Merge "shamu: Fix BOARD_MKBOOTIMG_ARGS"