Merge change I9195a354 into eclair-mr2

* changes:
  Add partial support of Android-specific properties.