am 941c3a22: Changed class paths for classes moved in unbundling effort

Merge commit '941c3a226d77a36ea43b8946d3f6b667449d13a8' into eclair-mr2-plus-aosp

* commit '941c3a226d77a36ea43b8946d3f6b667449d13a8':
  Changed class paths for classes moved in unbundling effort