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

Change-Id: I4498e13e488a65f884af5c21898f0d45906b01d7