Removing some support lib dependencies

Change-Id: I028ed591cc9cf0af94fe6e09fadcd255f07cdee5
4 files changed