am e0628134: (-s ours) am 53ccdf18: 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 'e0628134ab8c5f997d43cc6d8ed79fdea5e815f6':
  Fix a bug in Nine Patch library. [DO NOT MERGE]