Merge change 6107 into donut

* changes:
  Removed system/framework/android.awt.jar.