am 8d7fa52a: am 3c5557bb: Merge change Idd4c6e5f into eclair-sdk

Merge commit '8d7fa52af11670e2640b12466cc094960f0455b1' into eclair-mr2

* commit '8d7fa52af11670e2640b12466cc094960f0455b1':
  Move SDK tools package to r4