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