Vout: move the AndroidSurface vout to a subdirectory