am 1f799a6b: am d9f32b16: Merge "Ensure alignment of Res_png_9patch."

* commit '1f799a6b96eaa74a776bc2d1b3d52b937dd1a9ea':
  Ensure alignment of Res_png_9patch.