am 100a4f32: Cleaning up unused plugin declarations from the manifest.

Merge commit '100a4f32c017c69938e4a5602c341130c8d1f4ce' into eclair-mr2-plus-aosp

* commit '100a4f32c017c69938e4a5602c341130c8d1f4ce':
  Cleaning up unused plugin declarations from the manifest.