am ca3f968c: am 7d9c73fb: Merge "Prevent unhandled exception in NinePatchDrawable"

Merge commit 'ca3f968c6f0acbf94988d00bf21a82a2e8f49b86'

* commit 'ca3f968c6f0acbf94988d00bf21a82a2e8f49b86':
  Prevent unhandled exception in NinePatchDrawable