am f9c228a5: Merge change 6487 into donut

Merge commit 'f9c228a51fba54e80826fb6aa5d53f43a2e86042'

* commit 'f9c228a51fba54e80826fb6aa5d53f43a2e86042':
  Removed reference to awt jar from platform.xml.