CB3358-change Commons-codec:base64 to Android:Base64