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

diff --cc memtrack/1.0/vts/functional/VtsHalMemtrackV1_0TargetTest.cpp
index e3fb941,4c569ce..a8d8aea
--- 1/memtrack/1.0/vts/functional/VtsHalMemtrackV1_0TargetTest.cpp
--- 2/memtrack/1.0/vts/functional/VtsHalMemtrackV1_0TargetTest.cpp
+++ b/memtrack/1.0/vts/functional/VtsHalMemtrackV1_0TargetTest.cpp
@@@ -16,9 -16,11 +16,11 @@@
  
  #define LOG_TAG "memtrack_hidl_hal_test"
  #include <android-base/logging.h>
+ #include <android-base/unique_fd.h>
+ 
  #include <android/hardware/memtrack/1.0/IMemtrack.h>
  
 -#include <VtsHalHidlTargetBaseTest.h>
 +#include <VtsHalHidlTargetTestBase.h>
  
  #include <algorithm>
  #include <vector>