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

Change-Id: I243194a658ee8e9c5a21301601a473149eaa8a2f