Revert back to old layout

Considering we support a whole lot more devices then we used to, this makes sense.
Device specific stuff can be included in the ROM thread over at XDA and we can just
keep this for general ROM changes.

Change-Id: Iceb97234c1360c4b97ef33b4fd60bab700299c99