Merge "[hprof-conv] Check for NULL before closing descriptors" am: 16dbf336e9
am: 34c41cb0df

Change-Id: I5d6f9bf029d050b9e8dbd51b46d69f09159c5bed