Manifest for Android CTS 7.1 Release 3 (3764431)

Change-Id: Ie5ee33629b4b2a43df9955fc85f95dc2de206fc3

default.xml

@@ -1,11 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <manifest>
 
-  <remote  name="aosp"
-           fetch=".." />
-  <default revision="refs/tags/android-7.1.1_r52"
-           remote="aosp"
-           sync-j="4" />
+  <remote name="aosp" fetch=".." review="https://android-review.googlesource.com/"/>
+  <default revision="refs/tags/android-cts-7.1_r3" remote="aosp" sync-j="4"/>
 
   <project path="build" name="platform/build" groups="pdk,tradefed">
     <copyfile src="core/root.mk" dest="Makefile"/>
@@ -33,7 +30,6 @@
   <project path="device/generic/armv7-a-neon" name="device/generic/armv7-a-neon" groups="pdk"/>
   <project path="device/generic/common" name="device/generic/common" groups="pdk"/>
   <project path="device/generic/goldfish" name="device/generic/goldfish" groups="pdk"/>
-  <project path="device/generic/goldfish-opengl" name="device/generic/goldfish-opengl" groups="pdk" />
   <project path="device/generic/mips" name="device/generic/mips" groups="pdk"/>
   <project path="device/generic/mips64" name="device/generic/mips64" groups="pdk"/>
   <project path="device/generic/mini-emulator-arm64" name="device/generic/mini-emulator-arm64" groups="pdk"/>
@@ -165,6 +161,7 @@
   <project path="external/jdiff" name="platform/external/jdiff" groups="pdk-cw-fs,pdk-fs"/>
   <project path="external/jemalloc" name="platform/external/jemalloc" groups="pdk"/>
   <project path="external/jetty" name="platform/external/jetty" groups="pdk-fs"/>
+  <project path="external/jhead" name="platform/external/jhead" groups="pdk"/>
   <project path="external/jline" name="platform/external/jline" groups="notdefault,tradefed"/>
   <project path="external/jmdns" name="platform/external/jmdns" groups="pdk-cw-fs,pdk-fs"/>
   <project path="external/jsilver" name="platform/external/jsilver" groups="pdk-cw-fs,pdk-fs"/>
@@ -188,6 +185,7 @@
   <project path="external/libdaemon" name="platform/external/libdaemon"/>
   <project path="external/libevent" name="platform/external/libevent"/>
   <project path="external/libexif" name="platform/external/libexif" groups="pdk-cw-fs,pdk-fs"/>
+  <project path="external/libgdx" name="platform/external/libgdx" groups="pdk"/>
   <project path="external/libgsm" name="platform/external/libgsm" groups="pdk"/>
   <project path="external/libhevc" name="platform/external/libhevc" groups="pdk-fs"/>
   <project path="external/libjpeg-turbo" name="platform/external/libjpeg-turbo" groups="pdk"/>
@@ -249,6 +247,7 @@
   <project path="external/objenesis" name="platform/external/objenesis" groups="pdk-cw-fs,pdk-fs"/>
   <project path="external/okhttp" name="platform/external/okhttp" groups="pdk-cw-fs,pdk-fs"/>
   <project path="external/opencv" name="platform/external/opencv" groups="pdk-cw-fs,pdk-fs"/>
+  <project path="external/opencv3" name="platform/external/opencv3"/>
   <project path="external/owasp/sanitizer" name="platform/external/owasp/sanitizer" groups="pdk-fs"/>
   <project path="external/parameter-framework" name="platform/external/parameter-framework" groups="pdk-fs"/>
   <project path="external/pcre" name="platform/external/pcre" groups="pdk"/>
@@ -426,8 +425,7 @@
   <project path="packages/apps/Protips" name="platform/packages/apps/Protips" groups="pdk-fs"/>
   <project path="packages/apps/Provision" name="platform/packages/apps/Provision" groups="pdk-fs"/>
   <project path="packages/apps/QuickSearchBox" name="platform/packages/apps/QuickSearchBox" groups="pdk-fs"/>
-  <project path="packages/apps/RetailDemo" name="platform/packages/apps/RetailDemo" groups="pdk-fs" />
-  <project path="packages/apps/SafetyRegulatoryInfo" name="platform/packages/apps/SafetyRegulatoryInfo" groups="pdk-fs" />
+  <project path="packages/apps/SafetyRegulatoryInfo" name="platform/packages/apps/SafetyRegulatoryInfo"/>
   <project path="packages/apps/Settings" name="platform/packages/apps/Settings" groups="pdk-fs"/>
   <project path="packages/apps/SoundRecorder" name="platform/packages/apps/SoundRecorder" groups="pdk-fs"/>
   <project path="packages/apps/SpareParts" name="platform/packages/apps/SpareParts" groups="pdk-fs"/>