Merge change 6487 into donut

* changes:
  Removed reference to awt jar from platform.xml.