Merge "DO NOT MERGE: fix package for AndroidJUnitRunner"