Merge "Ensure alignment of Res_png_9patch."