Merge "Fix AndroidJUnit4 runner shrinked out by R8 issue." into tm-dev