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

Change-Id: I6f3331782124fe9447b6fc2eda1727a2bb645be7