Update to AOKP

Change-Id: I80ac20575d5ccc09c024b0d1ba13d335404cb956