Fix Travis build to work with SDK 23