Update AOKP Overlay for d2
Clean up some stuff and bump to V2.2