Merge "Use SDK 25 to match the junit target" am: 9a60bf3100
am: 8fd99c2f7f

Change-Id: I9fd6307d3d629c4ec644f93642bab999973df55e