Fix Travis build to work with SDK 23

Revesion 23 of the Android SDK introduced new build and platform tools
version 20. These are installed into Travis, so we have to use these.