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