Merge "Make base64 explicitly check dst_size for nullptr" am: 1a5a1e5527
am: 4633a44f84

Change-Id: I3bfa68e10269fd4c1fe31682cc447541cd2632f4