Merge "memtrack: eliminate dependency on surfaceflinger in VTS test"