Close files to prevent resource leakage

These two files open files to parse them and do not explicitly close
them.  The result is that on machines with large amounts of memory
the heap just continues to grow without GC kicking in to close the
files.  This change explicitly closes the files such that the resource
leakage doesn't happen.

Change-Id: Ie2328816ec06ce090d0fa26aad00064b74f93e10