Merge tag 'android-11.0.0_r16' into android-10.0

Android 11.0.0 release 16 - twrp bringup patch
diff --git a/twrpApex.cpp b/twrpApex.cpp
index 3df7b5d..d9505c3 100755
--- a/twrpApex.cpp
+++ b/twrpApex.cpp
@@ -46,7 +46,7 @@
 	}
 
 	ZipEntry entry;
-	ZipString zip_string(APEX_PAYLOAD);
+	std::string zip_string(APEX_PAYLOAD);
 	ret = FindEntry(handle, zip_string, &entry);
 	if (ret != 0) {
 		LOGERR("unable to find %s in zip\n", APEX_PAYLOAD);