Moved httpclient and httpmime to test scope

The following packages where defaulting to the compile scope while they are
only needed for unit tests:
    - org.apache.httpcomponents.httpclient
    - org.apache.httpcomponents.httpmime

This is causing unnecessary dependencies to be carried over to Android apps.
Expanded tabs to spaces

Cleaned up inconsistent use of tabs.  Made these 8ish lines more like the rest
of the POM.