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

Change-Id: Ie5fe7c908c2acd51b40c647b6b8710f0ead31110