Merge "Remove flo BoardConfig.mk cruft."