Merge "Remove the 'optional' tag from demangle_fuzzer" am: 48cf760bea
am: d8a0626047

Change-Id: I54a888a919df79315c57851d905616c28811540c