Merge "installd_dexopt_test: fix close of owned file descriptor."
am: 3a2607a504

Change-Id: Ib33ee6f6c4a3364287e52f46d2d1d3304011a6fa