manifest: switch back to aokp on some thingz

Change-Id: Ic8a82ea8d5f5cf91e1839739eaeaa6cd93db56b4
Signed-off-by: Jonathan Steadman <xxwhitehawk@gmail.com>