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

Change-Id: I576ed85991a0e25ba2b05458d928bc38149c24b8