am ef5caff8: 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 'ef5caff8b53f3b8ce85277824f14936047bc11d5':
  Fix a bug in Nine Patch library. [DO NOT MERGE]