Merge "Minor fixes on android::base::expected"