Merge "trusty: storageproxyd: use upstream kernel headers" am: ed01d17e1b am: 420d64de7b
am: d66e05c6c4

* commit 'd66e05c6c45698c69e3368090adfbd56c00fc9a8':
  trusty: storageproxyd: use upstream kernel headers

Change-Id: I95d91887acc3ae6fd86cb8a29973915b723319f7