Merge "Move libusbhost's headers into libusbhost." am: 36b88ce975 am: c190d472ef
am: 7691dc3223

Change-Id: Ice1c944ac16350f575f514dcef0f9a306627e4d2