Merge "Use SDK 25 to match the junit target"