Merge "Fix a bug in Nine Patch library. [DO NOT MERGE]" into jb-mr2-dev