Merge "remove Base64 from android-common"