Merge "Fix order of operations warning in libui"
am: 73d4186757

Change-Id: Ib93a8ddcb912b05cd38db1dea7ac0ff21a788bcd