am a84d29cb: am 6714e677: Merge "Ninepatch tweaks for better interop"

* commit 'a84d29cb0494310e9472884c7a459603eb305e38':
  Ninepatch tweaks for better interop