Fix dependencies

Change-Id: I8919a9f83cc9a0cfc0f992514585bd1f5844b2a0
I Hate Github

Change-Id: I1dca1f2910011816f32c11debfe6b9f0f4bdd31c
Merge "I Hate Github" into du44
I Hate Github

Change-Id: I1dca1f2910011816f32c11debfe6b9f0f4bdd99c
Merge "I Hate Github" into du44