am 6c56e9e1: (-s ours) Merge "DO NOT MERGE: fix package for AndroidJUnitRunner"

* commit '6c56e9e104d6071d459f04b266c6b8c53a32c635':
  DO NOT MERGE: fix package for AndroidJUnitRunner