Merge "Migrate StrictJarVerifier and ShortcutPackageInfo to java.util.Base64" am: 1e498a96c1 am: 6e2d3fa82f
am: 386ba42ec5

Change-Id: I0b0e8139cc084fbdf9918dd700d9be337e0c47df