am 38f954c8: am e0537c1d: (-s ours) am c7f8e64c: am 1830a58f: am 5bb3414d: Fix a bug in Nine Patch library. [DO NOT MERGE]

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