Add shim app for CTS testing

We need a shim application on the system partition that we can upgrade
during CTS tests.

Bug: 27450489
Change-Id: I32a72dc5110cedd466cdee2607965c705f7aa6d3
diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk
index 0b5ace1..627d496 100644
--- a/target/product/core_minimal.mk
+++ b/target/product/core_minimal.mk
@@ -24,16 +24,17 @@
 
 PRODUCT_PACKAGES += \
     BackupRestoreConfirmation \
-    WallpaperBackup \
+    CtsShimPrivPrebuilt \
+    DownloadProvider \
     ExtShared \
     ExtServices \
-    DownloadProvider \
     HTMLViewer \
     MediaProvider \
     PackageInstaller \
     SettingsProvider \
     Shell \
     StatementService \
+    WallpaperBackup \
     bcc \
     bu \
     com.android.future.usb.accessory \
diff --git a/target/product/core_tiny.mk b/target/product/core_tiny.mk
index f9ec032..58b75ea 100644
--- a/target/product/core_tiny.mk
+++ b/target/product/core_tiny.mk
@@ -37,12 +37,13 @@
 
 PRODUCT_PACKAGES += \
     BackupRestoreConfirmation \
-    WallpaperBackup \
+    CtsShimPrivPrebuilt \
     DefaultContainerService \
     ExtShared \
     ExtServices \
     SettingsProvider \
     Shell \
+    WallpaperBackup \
     bcc \
     bu \
     com.android.location.provider \