Merge "Fixes for host bionic support"