Merge "Minor fixes on android::base::expected"
am: 719790f560

Change-Id: I2ee4ede2f3113ad2627955a0de1cb3cff719c5b3