Remove ROMcontrol

Change-Id: Icb36375659917db155eb18af983d2c50cd9555c6
Merge upstream