merge aokp kitkat changes