Merge "Add android::base::expected::ok()"