Merge "Extract ASL in system APKs to new dir" into main