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

Change-Id: Ic9c1343a902b0952559d90a4c5f8558d73ce8f15