am 9163199a: am e2cf7d5d: am d478830e: am 9f6c572b: Merge "Revert "-Change persist.radio.data_no_toggle=1 to improve modem power reporting accuracy."" into mnc-dev

* commit '9163199a693f5b712ca953a5ead14055e41f2d66':
  Revert "-Change persist.radio.data_no_toggle=1 to improve modem power reporting accuracy."
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 4df1948..8d69a26 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -132,4 +132,6 @@
 # Include an expanded selection of fonts
 EXTENDED_FONT_FOOTPRINT := true
 
+USE_CLANG_PLATFORM_BUILD := true
+
 -include vendor/moto/shamu/BoardConfigVendor.mk
diff --git a/sepolicy/bluetooth_loader.te b/sepolicy/bluetooth_loader.te
index 8ac52ba..4449d9c 100644
--- a/sepolicy/bluetooth_loader.te
+++ b/sepolicy/bluetooth_loader.te
@@ -4,5 +4,4 @@
 # Started by init
 init_daemon_domain(bluetooth_loader)
 
-unix_socket_connect(bluetooth_loader, property, init)
-allow bluetooth_loader bluetooth_prop:property_service set;
+set_prop(bluetooth_loader, bluetooth_prop)
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index 447563d..a71453d 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -163,6 +163,9 @@
 /sys/devices/cycapsense_prog.1/cycapsense_fw             u:object_r:sysfs_capsense_update:s0
 /sys/devices/mmi_sar_ctrl.[0-9]*/sar_wifi                u:object_r:sysfs_sar_wifi:s0
 
+# wifi mac address
+/sys/devices/virtual/net/wlan0/address                   u:object_r:sysfs_mac_address:s0
+
 /system/bin/imsdatadaemon                       u:object_r:ims_exec:s0
 /system/bin/imsqmidaemon                        u:object_r:ims_exec:s0
 
diff --git a/sepolicy/ims.te b/sepolicy/ims.te
index a9f4a35..d2979e6 100644
--- a/sepolicy/ims.te
+++ b/sepolicy/ims.te
@@ -38,9 +38,6 @@
 # Runs /system/bin/ndc
 allow ims system_file:file rx_file_perms;
 
-# Talks to init via property socket.
-unix_socket_connect(ims, property, init)
-
 # Allow ims to tell init to start the ims data service via property=sys.ims.QMI_DAEMON_STATUS
 allow ims qcom_ims_prop:property_service set;
 
diff --git a/sepolicy/mdm_helper.te b/sepolicy/mdm_helper.te
index 45c2a7c..ee636ee 100644
--- a/sepolicy/mdm_helper.te
+++ b/sepolicy/mdm_helper.te
@@ -60,5 +60,4 @@
 allow mdm_helper dropbox_data_file:file create_file_perms;
 
 # write radio properties
-unix_socket_connect(mdm_helper, property, init)
-allow mdm_helper radio_prop:property_service set;
+set_prop(mdm_helper, radio_prop)
diff --git a/sepolicy/netmgrd.te b/sepolicy/netmgrd.te
index 506ada9..3e11096 100644
--- a/sepolicy/netmgrd.te
+++ b/sepolicy/netmgrd.te
@@ -42,8 +42,7 @@
 dontaudit netmgrd self:capability sys_module;
 
 # Set net_radio properties
-unix_socket_connect(netmgrd, property, init)
-allow netmgrd net_radio_prop:property_service set;
+set_prop(netmgrd, net_radio_prop)
 
 #Set netmgrd properties
 allow netmgrd qcom_netmgrd_prop:property_service set;
diff --git a/sepolicy/tcmd.te b/sepolicy/tcmd.te
index 0a00c85..cc9f6f1 100644
--- a/sepolicy/tcmd.te
+++ b/sepolicy/tcmd.te
@@ -7,11 +7,8 @@
 # Uses network sockets.
 net_domain(tcmd)
 
-# Set property.
-unix_socket_connect(tcmd, property, init)
-
 # Allow restart, fastboot, power off
-allow tcmd powerctl_prop:property_service set;
+set_prop(tcmd, powerctl_prop)
 
 # Uses /dev/ttydiag2
 allow tcmd diag_device:chr_file rw_file_perms;