Merge "Enable more modules on linux_bionic builds"