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

* commit '420d64de7b3406b3493e42bff8a5ac2631ec3314':
  trusty: storageproxyd: use upstream kernel headers

Change-Id: Iecda534cbd181f9e9f4bf4d28917fe2f8c17d565