Merge "Fix rounding of padding in NinePatchDrawable" into pi-dev