Merge "Remove redundant dependencies" into oc-dev-plus-aosp