Merge "Clean up include paths"
am: 0ecbdb32eb

Change-Id: I121b1c3e9cf5b658c46960893ae0aab4e78c8e57