Merge "Enable more modules on linux_bionic builds" am: 75c414d1a3
am: 5bb9220b75

Change-Id: I3dffb3e3ac95f8116321f165035a666645df34d0