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

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