Merge 'remix-staging' and 'kitkat-remix'

There's no point in us having a 'staging' branch for PA commits that are already filtered through their gerrit.