Merge "Revert^2 "Move some image/9patch code to androidfw"" into main