Merge "binder_ndk: use std::optional"