Merge "adbd_auth function signature changes." am: d62c817cce

Change-Id: I39eea46dc9d475bf9724125708541c577fbab4c7