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

Change-Id: Ie653cbb3bc5bf4e746a28d6e9620f3a55a9f784f