Merge "Automatically convert target API from 25 to 24."