Merge "Change priv-apps /data/data labels to privapp_data_file"