Close FILE* handles after consuming contents

Two more file-descriptor leaks.  Code was using fopen() to get a
handle, but was never calling fclose() once the file's contents had
been read and processed.

Bug: 13490553
Change-Id: I8c7dbf9d913d6363a14bb10bb5087836181eb1c5
2 files changed