Merge "Remove unused dependency on libandroid in libeds"