Merge "Fix surfaceflinger tests." into mnc-dev