Removing AOKP stuffs

Change-Id: I0e46314f94a43507679f1140632c40146fa21983
Signed-off-by: DHOMD <DHO@dho.im>
Signed-off-by: DHOMD <DHO@dho.im>
Partial revert of previous

Change-Id: Ic2a5aad8bc46250e4ff1c664d9049df89fea5ba8