Merge "Build: Bring back SDK dependencies"
am: eb06c77b80

Change-Id: I0c15adcd387980b94c5544427d4f4fdad3f7ff31