Merge "Annotate most remaining HALs with _client/_server"
am: 37f7ffa388

Change-Id: I57b6b54327d79011bf0366f46c77cecb2b8826ac