Merge "Remove ota_close(int) and ota_fclose(FILE*)." am: 7b59b45b08 am: 1f934beedd
am: 8762a560fc

Change-Id: Icb260caeb155cbd6db7b8810816b237ade3ed49f