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

Change-Id: If8a08b3f080344e61ebf5a0555354edb95cfb92e