Fix SDK build: a few things missing, a link that was wrong.

Change-Id: I55c9c510b3f0866ce6085927afa00b9fb69dd8c5
2 files changed