Merge "remove libui dependency on libEGL"