Merge "Revert "Build: Bring back SDK dependencies""