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

Change-Id: I8fbce66a7a5f41281fa12ce34869f2a1b5e10413