Merge "Update junit with Android runner specific changes."