Merge "Replace the bionic hack for a vfprintf leak with (roughly) the upstream fix."