Merge "make-3.81: Fix build on Ubuntu Trusty"