Use build-tools 25.0.0
am: 7f96fc5aee

Change-Id: I00f5341b61712dd98935d1e40791a8d30194b64c