[automerger skipped] Merge "Capture libeigen's header correctly" am: c918345b0d am: 231a220167 -s ours

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

Change-Id: I0014644b1af552a3909b22ef4a90f650c2b4e7af