Flatten include directory structure

Test: compiles
Change-Id: If26cf3ff39e06478d7621c23ff3472bd280e5fe2
29 files changed