Merge "junit doesn't need the framework." am: 076c475e79 am: 8ff805e22a
am: 3fab7a03e7

Change-Id: I09e1650511d6d38a3aea89772cb80da798d89595