Merge "Remove dead code from NinePatch::Draw"