Merge "remove libui's dependency on libpixelflinger"