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

Change-Id: I959d837f06cfbc747261b92d7202b953ee2e15f1