Merge "Remove redundant dependencies" into oc-dev-plus-aosp
am: a87166a33a

Change-Id: Idac3d0608c189f8df78a5ec866a533092cefac7f