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

Change-Id: I10da8332166d94c543ea94519af702961d3a429c