am c0086ba5: am 9bcfee1d: (-s ours) am 30e59135: am c07a48be: Merge "Fix a bug in Nine Patch library. [DO NOT MERGE]" into jb-mr2-dev

* commit 'c0086ba57f3bba1f9139baf72ed38f79f3e4ac02':
  Fix a bug in Nine Patch library. [DO NOT MERGE]