Revert #8245 #4556

Job	Run time
Build Magisk artifacts	17m 25s
Build Magisk artifacts	17m 25s
Test building on windows-latest	10m 30s
Test building on windows-latest	10m 30s
Test building on ubuntu-latest	5m 26s
Test building on ubuntu-latest	5m 26s
Test aosp_cf_x86_64_phone	5m 11s
Test aosp_cf_x86_64_phone	5m 11s
Test API 23 (x86)	3m 18s
Test API 23 (x86)	3m 18s
Test aosp_cf_x86_64_phone_pgagnostic	5m 52s
Test aosp_cf_x86_64_phone_pgagnostic	5m 52s
Test API 23 (x86_64)	3m 35s
Test API 23 (x86_64)	3m 35s
Test API 24 (x86)	2m 27s
Test API 24 (x86)	2m 27s
Test API 24 (x86_64)	2m 45s
Test API 24 (x86_64)	2m 45s
Test API 25 (x86)	2m 0s
Test API 25 (x86)	2m 0s
Test API 25 (x86_64)	3m 24s
Test API 25 (x86_64)	3m 24s
Test API 26 (x86)	3m 35s
Test API 26 (x86)	3m 35s
Test API 26 (x86_64)	3m 8s
Test API 26 (x86_64)	3m 8s
Test API 27 (x86)	4m 15s
Test API 27 (x86)	4m 15s
Test API 27 (x86_64)	4m 16s
Test API 27 (x86_64)	4m 16s
Test API 28 (x86)	3m 42s
Test API 28 (x86)	3m 42s
Test API 28 (x86_64)	10m 18s
Test API 28 (x86_64)	4m 4s
Test API 29 (x86)	2m 56s
Test API 29 (x86)	2m 56s
Test API 29 (x86_64)	4m 6s
Test API 29 (x86_64)	4m 6s
Test API 30 (x86)	5m 58s
Test API 30 (x86)	5m 58s
Test API 30 (x86_64)	4m 6s
Test API 30 (x86_64)	4m 6s
Test API 31 (x86_64)	4m 8s
Test API 31 (x86_64)	4m 8s
Test API 32 (x86_64)	3m 40s
Test API 32 (x86_64)	3m 40s
Test API 33 (x86_64)	4m 5s
Test API 33 (x86_64)	4m 5s
Test API 34 (x86_64)	3m 53s
Test API 34 (x86_64)	3m 53s
Test API 35 (x86_64)	4m 17s
Test API 35 (x86_64)	4m 17s
	4h 10m 18s

Provide feedback