Remove libcore/include/ from Terminal's include path. am: 3cb5403b8d
am: 31daf87a58

Change-Id: I91bb83b92acd7d83bf809e1403595feb0d60757b