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

Change-Id: Id80b3161d864392b249eb3d01ebbd28be16a8e61