Merge "Move AAF build to Ubuntu 1804"