Merge change I2089d86d into eclair-sdk

* changes:
  Fix the android launcher script to not force Java 1.5 on MacOS