Merge changes 108,130,131 into donut

* changes:
  util/DebugUtils: Remove references to android.util.Config
  text: Remove references to android.util.Config
  Remove references to android.util.Config