Merge "Statically link missing libary to SurfaceFlinger_test"