Merge changes from topic "imgdiff" am: e7a060a91b am: b2c7beb2b1 am: d425351e4f

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1548894

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1442ccda0368bedc35b882e45d19df58f179e0cf
diff --git a/tests/testdata/recovery-from-boot.p b/tests/testdata/recovery-from-boot.p
index 06f6c29..81738ed 100644
--- a/tests/testdata/recovery-from-boot.p
+++ b/tests/testdata/recovery-from-boot.p
Binary files differ
diff --git a/tests/unit/applypatch_modes_test.cpp b/tests/unit/applypatch_modes_test.cpp
index 9e97979..08414b7 100644
--- a/tests/unit/applypatch_modes_test.cpp
+++ b/tests/unit/applypatch_modes_test.cpp
@@ -100,7 +100,7 @@
   ASSERT_EQ(2, InvokeApplyPatchModes({ "applypatch", "-x" }));
 }
 
-TEST_F(ApplyPatchModesTest, DISABLED_PatchModeEmmcTarget) {
+TEST_F(ApplyPatchModesTest, PatchModeEmmcTarget) {
   std::vector<std::string> args{
     "applypatch",
     "--bonus",
@@ -118,7 +118,7 @@
 
 // Tests patching an eMMC target without a separate bonus file (i.e. recovery-from-boot patch has
 // everything).
-TEST_F(ApplyPatchModesTest, DISABLED_PatchModeEmmcTargetWithoutBonusFile) {
+TEST_F(ApplyPatchModesTest, PatchModeEmmcTargetWithoutBonusFile) {
   std::vector<std::string> args{
     "applypatch", "--patch", from_testdata_base("recovery-from-boot-with-bonus.p"),
     "--target",   target,    "--source",
diff --git a/tests/unit/applypatch_test.cpp b/tests/unit/applypatch_test.cpp
index 4b80dce..218a224 100644
--- a/tests/unit/applypatch_test.cpp
+++ b/tests/unit/applypatch_test.cpp
@@ -132,7 +132,7 @@
       PatchPartitionCheck(target_partition, Partition(target_file, source_size, source_sha1)));
 }
 
-TEST_F(ApplyPatchTest, DISABLED_PatchPartition) {
+TEST_F(ApplyPatchTest, PatchPartition) {
   FileContents patch_fc;
   ASSERT_TRUE(LoadFileContents(from_testdata_base("recovery-from-boot.p"), &patch_fc));
   Value patch(Value::Type::BLOB, std::string(patch_fc.data.cbegin(), patch_fc.data.cend()));
@@ -146,7 +146,7 @@
 
 // Tests patching an eMMC target without a separate bonus file (i.e. recovery-from-boot patch has
 // everything).
-TEST_F(ApplyPatchTest, DISABLED_PatchPartitionWithoutBonusFile) {
+TEST_F(ApplyPatchTest, PatchPartitionWithoutBonusFile) {
   FileContents patch_fc;
   ASSERT_TRUE(LoadFileContents(from_testdata_base("recovery-from-boot-with-bonus.p"), &patch_fc));
   Value patch(Value::Type::BLOB, std::string(patch_fc.data.cbegin(), patch_fc.data.cend()));