Merge remote-tracking branch 'omnirom/android-8.1' into twrp-8.1

Conflicts:
	default.xml
	omni-default.xml

Change-Id: I3113e86ff38db6129c120cd1acf843570e530d76

default.xml

@@ -3,7 +3,8 @@
   <remote  name="aosp"
            fetch="https://android.googlesource.com"
            review="https://android-review.googlesource.com/" />
-  <default revision="refs/tags/android-8.1.0_r7"
+
+  <default revision="refs/tags/android-8.1.0_r11"
            remote="aosp"
            sync-c="true"
            sync-j="12" />

omni-aosp.xml

@@ -26,6 +26,8 @@
 
   <project path="development" name="android_development" remote="omnirom" revision="android-8.1" groups="pdk-cw-fs,pdk-fs" />
 
+  <project path="external/aac" name="android_external_aac" remote="omnirom" revision="android-8.1" />
+  <project path="external/chromium-webview" name="android_external_chromium-webview" remote="omnirom" revision="android-8.1" />
   <project path="external/e2fsprogs" name="android_external_e2fsprogs" remote="omnirom" revision="android-8.1" />
   <project path="external/mksh" name="android_external_mksh" remote="omnirom" revision="android-8.1" />
   <project path="external/tinycompress" name="android_external_tinycompress" remote="omnirom" revision="android-8.1" />

omni-default.xml

@@ -22,6 +22,7 @@
   <project path="packages/apps/DSPManager" name="android_packages_apps_DSPManager" remote="omnirom" revision="android-8.1" />
   <project path="packages/apps/Matlog" name="android_packages_apps_Matlog" remote="omnirom" revision="android-8.1" />
   <project path="packages/apps/MonthCalendarWidget" name="android_packages_apps_MonthCalendarWidget" remote="omnirom" revision="android-8.1" />
+  <project path="packages/apps/OmniChange" name="android_packages_apps_OmniChange" remote="omnirom" revision="android-8.1" />
   <project path="packages/apps/OmniClock" name="android_packages_apps_OmniClock" remote="omnirom" revision="android-8.1" />
   <project path="packages/apps/OmniGears" name="android_packages_apps_OmniGears" remote="omnirom" revision="android-8.1" />
   <project path="packages/services/OmniJaws" name="android_packages_services_OmniJaws" remote="omnirom" revision="android-8.1" />

remove-minimal.xml

@@ -13,7 +13,6 @@
     <remove-project name="device/google/wahoo" />
     <remove-project name="device/google/wahoo-kernel" />
 
-    <remove-project name="platform/external/aac" />
     <remove-project name="platform/external/abi-compliance-checker" />
     <remove-project name="platform/external/abi-dumper" />
     <remove-project name="platform/external/adt-infra" />
@@ -37,7 +36,6 @@
     <remove-project name="platform/external/cblas" />
     <remove-project name="platform/external/chromium-libpac" />
     <remove-project name="platform/external/chromium-trace" />
-    <remove-project name="platform/external/chromium-webview" />
     <remove-project name="platform/external/cmockery" />
     <remove-project name="platform/external/crcalc" />
     <remove-project name="platform/external/cros/system_api" />
@@ -415,6 +413,9 @@
     <!-- Remove from omni-aosp.xml (forked AOSP) -->
     <remove-project name="android_development" />
 
+    <remove-project name="android_external_aac" />
+    <remove-project name="android_external_chromium-webview" />
+
     <!-- refer to twrp-extras.xml why android_frameworks_base is removed here -->
     <remove-project name="android_frameworks_base" />
 
@@ -463,6 +464,7 @@
     <remove-project name="android_packages_apps_DSPManager" />
     <remove-project name="android_packages_apps_Matlog" />
     <remove-project name="android_packages_apps_MonthCalendarWidget" />
+    <remove-project name="android_packages_apps_OmniChange" />
     <remove-project name="android_packages_apps_OmniClock" />
     <remove-project name="android_packages_apps_OmniGears" />
     <remove-project name="android_packages_services_OmniJaws" />

remove.xml

@@ -53,7 +53,9 @@
   <remove-project name="device/linaro/hikey-kernel" />
   <remove-project name="device/sample" />
 
+  <remove-project name="platform/external/aac" />
   <remove-project name="platform/external/e2fsprogs" />
+  <remove-project name="platform/external/chromium-webview" />
   <remove-project name="platform/external/libnfnetlink" />
   <remove-project name="platform/external/libnetfilter_conntrack" />
   <remove-project name="platform/external/mksh" />