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

Change-Id: I6f16b29db40e5099b9fbae14b0ab8fec7187053e