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

Change-Id: I9386159901adc5210fb9a703b9499055e71e0863