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

Change-Id: Ib349cbf086816a2648b16affc3f687db48e8a1c3