Merge "Use -Werror in external/eigen" am: a29a294104
am: 3fdd3c91dd

Change-Id: If472a99d6f0bf27ec1e83574e0864e2b1cf6e3e4