attempt to merge kitkat-remix into kitkat-legacy on kk-test