Merge "Clean up include paths" am: 0ecbdb32eb
am: 77f789e6ac

Change-Id: Iffa203bb72db6bb36474e9f677ca829dfc060625