Merge "Remove unused dependency to libandoridicu"