am 9848f11f: Merge change 5826 into donut

Merge commit '9848f11fd8788b985330183aeb83cc589b8b14ae'

* commit '9848f11fd8788b985330183aeb83cc589b8b14ae':
  Fix NullPointerException in NinePatch constructor