Merge AOKP into kitkat