am 934b8ca5: resolved conflicts for merge of 8915fd90 to eclair-mr2-plus-aosp

Merge commit '934b8ca57bb5d45d28450c12af3a5c765ba51c12'

* commit '934b8ca57bb5d45d28450c12af3a5c765ba51c12':
  Remove components that were moved to sdk.git and update build scripts.