Merge changes Iee153445,Iee274471 am: 79df15ea88

Original change: https://android-review.googlesource.com/c/platform/external/eigen/+/1999079

Change-Id: I0c5108390c595f0d39af8797875f2b88accb7b56