Merge with AOKP's kitkat