Merge branch 'v1-s-gotenks' into 'v1-s'

<?xml version="1.0" encoding="UTF-8"?>

<manifest>

  <project name="e/devices/android_device_google_sunfish" path="device/google/sunfish" remote="e" />

  <project name="LineageOS/android_kernel_google_msm-4.14" path="kernel/google/msm-4.14" remote="github" />

</manifest>