Merge AOKP:kitkat into AOSCP:kitkat