Merge "Statically link missing libraries to libsurfaceflinger_unittest"