Merge "Break a dependency of libui on libandroid"