Merge "[ANativeWindow] Test with a TestableSurface"