Merge changes Iee153445,Iee274471 am: 79df15ea88 am: 10f298fc41

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

Change-Id: I3dd349f9a45d37f37441ff7a7742ebe953b70516