am d87e9d35: (-s ours) am e561dd48: (-s ours) DO NOT MERGE: fix package for AndroidJUnitRunner

* commit 'd87e9d353430779e00551eb394f5b9340099470a':
  DO NOT MERGE: fix package for AndroidJUnitRunner