Merge "minui: Minor clean up to graphics.cpp." am: b04bc0540d am: ec8d74580d
am: 7d8e13a535

Change-Id: Ia8041250f259e3aded94a623c72aa589980b383a