[automerger skipped] Merge "Capture libeigen's header correctly" am: c918345b0d am: 231a220167 -s ours am: 2915c6fd4b -s ours am: 2f1c474edd -s ours am: 5b04f4671e -s ours

am skip reason: Change-Id I47830c8818a7fe804c8a769069804275b09e99e8 with SHA-1 08cc6ed02b is in history

Change-Id: I36caf6e9463291a687051f7df6db43be0bcaa6e6