Merge "fix circular dependency libnativewindow <-> libui"