Backed out 2 changesets (bug 1861618, bug 1856240) for causing build bustages in ClearKeyUtils.cpp CLOSED TREE

Backed out changeset 0ee046556e13 (bug 1856240)
Backed out changeset fb450a287979 (bug 1861618)

media/gmp-clearkey/0.1/ClearKeyUtils.cpp

@@ -252,6 +252,7 @@ static bool EncodeBase64Web(vector<uint8_t> aBinary, string& aEncoded) {
 
     // out of bounds index for 'sAlphabet'
     assert(idx < MOZ_ARRAY_LENGTH(sAlphabet));
+    out[i] = sAlphabet[idx];
   }
 
   return true;

mozglue/baseprofiler/core/shared-libraries-linux.cc

@@ -517,8 +517,7 @@ class FileID {
 
     if (cls == ELFCLASS32) {
       return FindElfClassSegment<ElfClass32>(elf_base, segment_type, segments);
-    }
-    if (cls == ELFCLASS64) {
+    } else if (cls == ELFCLASS64) {
       return FindElfClassSegment<ElfClass64>(elf_base, segment_type, segments);
     }