Fix bionic optimizations to match build repo changes
Signed-off-by: Paul Beeler <sparksco@gmail.com>