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

Change-Id: I90b1d5f85e5af5892d2360e938e1dbd681a2fc2a