Merge "Revert "vendor: {TEMP}: extract_files.sh: still write makefiles for jars and apps"" into android-10