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

Merge commit '13bf8260134d516cbcc982d360d9f21067f47fa6' into eclair-plus-aosp

* commit '13bf8260134d516cbcc982d360d9f21067f47fa6':
  Fix SDK build: a few things missing, a link that was wrong.