Merge "Remove libsurfaceflinger_unittest from root TEST_MAPPING"