am d9f32b16: Merge "Ensure alignment of Res_png_9patch."

* commit 'd9f32b164be11b6c42ee36ca6945623073e82c99':
  Ensure alignment of Res_png_9patch.