cm: trim down our rom like hell (vendor part)

Change-Id: I1a2b7425372718694b3cfe321426e060b6774528
Merge "cm: trim down our rom like hell (vendor part)" into jellybean