merge aokp kitkat