am 3c5557bb: Merge change Idd4c6e5f into eclair-sdk

Merge commit '3c5557bb5e9235737c4c7ddda4c66f14396105cf' into eclair

* commit '3c5557bb5e9235737c4c7ddda4c66f14396105cf':
  Move SDK tools package to r4