Merge "[AWARE] Simplify Wi-Fi Aware API namespace" am: 834a87d525 am: fd23421472 am: 0bad91b5ac
am: 0232d18805

Change-Id: Ibdb559206159eb840810f55f51545cdc797d16d6