Fixed build dependencies

Change-Id: Ia3ff48c43d56ea89db1efc08a7d95da0325425b2
Merge "Fixed build dependencies"