Merge change 5826 into donut

* changes:
  Fix NullPointerException in NinePatch constructor