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

Change-Id: I6ba8709fcce9e68b85811959400c5240e2a2bb36