Merge Remix-legacy into kitkat-legacy