Merge change I229c60a9 into eclair

* changes:
  Move source.properties for platform in sync with 2.0.1