merged aokp kitkat changes