Moved all Build Props to system.prop