am 33a9741c: Merge "Cleanup 9patch mesh matching code Bug #7970966"

* commit '33a9741c1be99e8be01ab799eb50df97849ed801':
  Cleanup 9patch mesh matching code Bug #7970966