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

Change-Id: I0deeef9e5e45e7e788888df48e8547d18498579c