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

* commit 'd68d6c6ddabb6bc1e78b38c9c2dd6beda7970f8d':
  Remove googleclient from the framework, and its classes from the preload list.