Fixes redundant dependencies and .gitignore issue.

Change-Id: Ie6c63ca909180ed1a46968b7a77b7f0479451e3f
3 files changed