Created by: tgummerer
This is another pull request that will mainly benefit the work I'm currently doing for the android_instrumentation_test rule. Thought I'd get this out early, as it makes sense on it's own, and the end game will be simpler without this included.