am c6343adf: Changed class paths for classes moved in unbundling effort

Merge commit 'c6343adff2abb5ae8ec2cc7ba613dd7e48ba7e9a' into eclair-mr2-plus-aosp

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