Revert roman/aokp patch overlay

Change-Id: Ia534004ccad1096019ed90b04c22f2d003597b99