Merge "Allow apexd to label apk_tmp_file to apex_data_file"