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

Change-Id: I8ff1727e4c85ae956491338606b3a563cb3a927a