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

Change-Id: I711e9b1d22cd37c24d6002ac424935bd0c766ff2