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

Change-Id: Ia3051fbd8447490d00c0232f66528065102f4273