merge kitkat-private with kitkat