Merge "apexd: allow apexd to unlink staging_data_file files"