Revert "Don't bother supporting Android API level 5 - drop support package."

This reverts commit 4caecd7f47532f98e30d6f3d240a9411287b8911.
Add Android support library to Maven build via the SDK deployer.
Remove an unused import and organize the remaining imports.
Remove and unused warning supression.
Work around a bug in the Android testing framework for services.