fix releasetools_test am: c4b7b34b4b am: 4197f3a4c6 am: c404ba2e2e am: 5f4eaf17e8

Original change: https://android-review.googlesource.com/c/platform/build/+/1870249

Change-Id: Icd636b8eafffc835b07d3b9c07e5df8bffac692e

tools/releasetools/test_build_image.py

@@ -196,7 +196,7 @@ class BuildImageTest(test_utils.ReleaseToolsTestCase):
     p.communicate()
     self.assertEqual(0, p.returncode)
 
-    fs_dict = GetFilesystemCharacteristics(output_file)
+    fs_dict = GetFilesystemCharacteristics('ext4', output_file)
     self.assertEqual(int(fs_dict['Block size']), 4096)
     self.assertGreaterEqual(int(fs_dict['Free blocks']), 0) # expect ~88
     self.assertGreater(int(fs_dict['Inode count']), 0)      # expect ~64

tools/releasetools/test_sign_apex.py

@@ -69,5 +69,5 @@ class SignApexTest(test_utils.ReleaseToolsTestCase):
         payload_key,
         container_key,
         False,
-        codename_to_api_level_map={'S': 31})
+        codename_to_api_level_map={'S': 31, 'Tiramisu' : 32})
     self.assertTrue(os.path.exists(signed_apex))