Merge "DO NOT MERGE: fix package for AndroidJUnitRunner" into stage-aosp-master