Merge change Idd4c6e5f into eclair-sdk

* changes:
  Move SDK tools package to r4