Use qualified base::make_optional in optional_unittest.cc
am: f0235bdc79

Change-Id: I7aa97f778599ec94bcd21237437408b3a7ae06df