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

Change-Id: I10e51d0e7d978c67e98c4f93b5e5dfe604e97564