Merge branch 'kitkat-remix' of github.com:AOSPAL/manifest into kitkat-remix