Merge "Cleanup 9patch mesh matching code Bug #7970966"