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

Change-Id: I45f4088fae0c16e696b5223a9d853f0ffa46525c