Merge "Allow apexd to label apk_tmp_file to apex_data_file" am: cc18ba7039
am: d23d33922c

Change-Id: I5a5d8b102d6008a23d81626384cfde486dd8c4cc