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

Change-Id: I2fc50cecee6fcd7d2f937b8b757cbcc8f55f5494