Merge "Stem names are used in apkcerts.txt"