Merge "Build: Bring back SDK dependencies"