resolved conflicts for merge of 4fc702ec to klp-dev-plus-aosp

Change-Id: I10d26e6ed6d129c9fef27d0d0c2610d21e6442dd

system_server.te

@@ -42,6 +42,7 @@ allow system_server anr_data_file:dir relabelto;
 allow system_server system_data_file:dir relabelto;
 allow system_server apk_data_file:file relabelto;
 allow system_server apk_tmp_file:file relabelto;
+allow system_server apk_private_tmp_file:file relabelto;
 allow system_server cache_backup_file:file relabelto;
 allow system_server apk_private_tmp_file:file relabelto;
 allow system_server wallpaper_file:file relabelto;

vold.te

@@ -50,6 +50,7 @@ allow vold efs_file:file rw_file_perms;
 
 # Create and mount on /data/tmp_mnt.
 allow vold system_data_file:dir { create rw_dir_perms mounton };
+allow vold system_data_file:file create_file_perms;
 
 # Set scheduling policy of kernel processes
 allow vold kernel:process setsched;