Merge "KylinMod/kitkat" into "kk--upstream"