Merge remote-tracking branch 'aokp/kitkat' into sm