Merge "Move convertToResPath from libutils to aapt." into main