Merge "adbd_auth function signature changes." am: d62c817cce am: f3c0bcf622

Change-Id: Idb9f945491e2c144cf569c4a10b0ff917aaec148