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

Change-Id: I2b5f49120404bc48703e6f5c0e7285077ed2bd08