CB-3358: Change Commons-codec:base64 to Android:Base64