Travis: fixes for current build failures.
Travis: fixes for current build failures.

mp3guy/Pangolin,stevenlovegrove/Pangolin,mp3guy/Pangolin,stevenlovegrove/Pangolin,mp3guy/Pangolin,stevenlovegrove/Pangolin