Remove structures now found in kernel headers.
am: 4785862b24

Change-Id: I3ba402ddc86b8adfc55c58715addb48067b49819