Merge "Fix order of operations warning in libui" am: 73d4186757 am: 1b080b15aa am: 544c391292
am: 1f54f9b392

Change-Id: I0e844f953819730fff3539023d5bdeea274ab4d5