Merge "releasetools: Fix two minor issues with _LoadOemDicts()."