Snap for 4957512 from a89dd7aeac to qt-release

Change-Id: Idb6ba5f6ddb6619085f485e3dc79bd52b581da38

Android.bp

@@ -291,3 +291,11 @@ cc_binary {
         "recovery-refresh.rc",
     ],
 }
+
+filegroup {
+    name: "res-testdata",
+
+    srcs: [
+        "res-*/images/*_text.png",
+    ],
+}

Android.mk

@@ -80,5 +80,4 @@ endif
 include $(BUILD_PHONY_PACKAGE)
 
 include \
-    $(LOCAL_PATH)/tests/Android.mk \
     $(LOCAL_PATH)/updater/Android.mk \

install.cpp

@@ -248,7 +248,7 @@ int SetUpAbUpdateCommands(const std::string& package, ZipArchiveHandle zip, int
   }
   long payload_offset = payload_entry.offset;
   *cmd = {
-    "/sbin/update_engine_sideload",
+    "/system/bin/update_engine_sideload",
     "--payload=file://" + package,
     android::base::StringPrintf("--offset=%ld", payload_offset),
     "--headers=" + std::string(payload_properties.begin(), payload_properties.end()),