Cleanup repo F - move flags from system.prop to holiday.mk