Add android-21 to the travis build and upgrade build tools used by travis.