Upgrade jUnit and android-maven-plugin

Also reorganized project to match the new standard Android structure.

Signed-off-by: Jacob Morris <jmorris@pivotal.io>