-----Patching /home/derfelot/android/system/device/sony/shinano-common
From https://github.com/LineageOS/android_device_sony_shinano-common
 * branch            cm-14.1    -> FETCH_HEAD
HEAD is now at 768059d... shinano-common: fix selinux denial in credmgrd
Applying change number 179549...
--> Subject:       "shinano-common: update proprietary files from stock 23.5.A.1.291"
--> Project path:  device/sony/shinano-common
--> Change number: 179549 (Patch Set 179549)
['git fetch github', u'refs/changes/49/179549/44']
From https://github.com/LineageOS/android_device_sony_shinano-common
 * branch            refs/changes/49/179549/44 -> FETCH_HEAD
[detached HEAD 7d72b2e] shinano-common: update proprietary files from stock 23.5.A.1.291
 Author: Steven Lay <arbiter1000@gmail.com>
 Date: Sun Jul 2 10:31:35 2017 +0000
 1 file changed, 133 insertions(+), 43 deletions(-)

Applying change number 179843...
--> Subject:       "shinano-common: readd wait4tad_static & tad_static"
--> Project path:  device/sony/shinano-common
--> Change number: 179843 (Patch Set 179843)
['git fetch github', u'refs/changes/43/179843/1']
From https://github.com/LineageOS/android_device_sony_shinano-common
 * branch            refs/changes/43/179843/1 -> FETCH_HEAD
[detached HEAD 8288374] shinano-common: readd wait4tad_static & tad_static
 Author: tomascus <arbiter1000@gmail.com>
 Date: Tue Jul 4 16:43:02 2017 +1000
 3 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100755 rootdir/sbin/tad_static
 create mode 100755 rootdir/sbin/wait4tad_static

Applying change number 179882...
--> Subject:       "shinano-common: remove extract util scripts"
--> Project path:  device/sony/shinano-common
--> Change number: 179882 (Patch Set 179882)
['git fetch github', u'refs/changes/82/179882/2']
From https://github.com/LineageOS/android_device_sony_shinano-common
 * branch            refs/changes/82/179882/2 -> FETCH_HEAD
[detached HEAD a3adbae] shinano-common: remove extract util scripts
 Author: Steven Lay <arbiter1000@gmail.com>
 Date: Wed Jul 5 05:03:29 2017 +0000
 1 file changed, 16 deletions(-)
 delete mode 100755 extract-files.sh

Applying change number 180159...
--> Subject:       "shinano-common: remove libwvm shim"
--> Project path:  device/sony/shinano-common
--> Change number: 180159 (Patch Set 180159)
['git fetch github', u'refs/changes/59/180159/6']
From https://github.com/LineageOS/android_device_sony_shinano-common
 * branch            refs/changes/59/180159/6 -> FETCH_HEAD
error: could not apply 6a9734c... shinano-common: remove libwvm shim
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
ERROR: git command failed
-----Patching /home/derfelot/android/system/device/sony/z3c