Merge "Use Base64 from android.util in LocalTransport" am: 8b9f98536e am: ec99ee195c
am: a234b4579c

Change-Id: I5b7caa54102f2334e6b15699bb0846c721cd9922