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

Change-Id: Ied34b0a478f997e13ceae7c835d71c35330e9020