Merge "Use PublicFormat from libui" am: 7e7836e3e1
am: 70c94ca4de

Change-Id: I1dbe6b08fcc5651ba73c80c8f52558f31d98307f