Remove libcore/include/ from the Car include path.
am: c2f6f6add8

Change-Id: Ie5408d5978b77f0714f62f1416d46f131fd64a84