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

Change-Id: I100b80d40658f1a6932faeebc3ca1785b3081499