Merge "add Base64OutputStream to android-common"