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

Change-Id: I6b04eceac03edf2785f307295ace2e933d2ab226