Merge "Add -e package description to InstrumentationTestRunner javadoc."