Fix Travis build to work with SDK 23
Merge pull request #1063 from WonderCsabo/fixTravisForSDK23

Fix Travis build to work with SDK 23