Merge "Fix parsing issues in board_config.mk"