Merge "Remove flo BoardConfig.mk no-op."