AOKP merge