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

Change-Id: I4c0f080bec08f3437c7c2c393a8213609f8ac623