ROMControl: set config.xml back to previous state and
            keep changes for flo and mako in vendor only

Change-Id: If113cf33eb32e6bd10d5081302647ceb18473c4a