am 831ea07d: Merge change 6107 into donut

Merge commit '831ea07dabf6331b7a410971eb85b2ae72239b50'

* commit '831ea07dabf6331b7a410971eb85b2ae72239b50':
  Removed system/framework/android.awt.jar.