Merge remote-tracking branch 'goffioul/master'

diff --cc android.hardware.graphics.composer@2.1-service.drmfb.rc
index 76afca8,48c4c91..996bbb8
--- 1/android.hardware.graphics.composer@2.1-service.drmfb.rc
--- 2/android.hardware.graphics.composer@2.1-service.drmfb.rc
+++ b/android.hardware.graphics.composer@2.1-service.drmfb.rc
@@@ -2,7 -2,6 +2,7 @@@ service vendor.hwcomposer-2-1.drmfb /ve
      class hal animation
      user system
      group graphics drmrpc
-     capabilities SYS_NICE
+     capabilities SYS_NICE NET_ADMIN
      onrestart restart surfaceflinger
      writepid /dev/cpuset/system-background/tasks
 +    disabled