Small fixes; Add android_external_jsr330+libraries for dependency injection