Revert "track own ROMControl"

This reverts commit 67b1eeecdc4c5fad59ebcba119f86d52e6a8644e.

Change-Id: Iae9da2d37d5210740e973dc9256218457d01bda9
Merge "Revert "track own ROMControl"" into kitkat