Merge commit '0d531f5b5927556fd94e44eedacb678f6341479b' into kraken * commit '0d531f5b5927556fd94e44eedacb678f6341479b': relocate android.util.base64.* -> android.util.*
Merge commit '0d531f5b5927556fd94e44eedacb678f6341479b' into kraken * commit '0d531f5b5927556fd94e44eedacb678f6341479b': relocate android.util.base64.* -> android.util.*