Merge "[AWARE] Separate Aware (NAN) VTS tests into a separate test binary."
am: 16ae0c8f86

Change-Id: Ib18f8ad75e9e8dc687e755da705314b3e924599f