Merge "Lose convertToResPath to aapt." into main