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

Change-Id: Icfc4eb32b0d5b52c0f918a2274c1ffecab74b0ec