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

* commit 'e24d36b7b744540ccd3401609248ed9d48be4cc9':
  Ensure alignment of Res_png_9patch.