Fixes redundant dependencies and .gitignore issue. am: 792c1c9a am: 16a91ffd am: 00c77fb9 am: 9a75eb7e am: 4b7001c6 * commit '4b7001c6': Fixes redundant dependencies and .gitignore issue. Change-Id: Ibf1c1e0d036b85a3b0c680db9476c406d957aad1