Change target SDK to 25
am: 0b7ace414a

Change-Id: I1884a70cf9a12095f7474acc3abe23e58e1f2628