Update to AOKP

Change-Id: I5aa72f48004df6738c13515d138c5633bea443ef