Merge change 64 into donut

* changes:
  Remove references to android.util.Config