Merge "trusty: storageproxyd: use upstream kernel headers"