Merge "Do not redefine dependencies from odlparent"