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

Change-Id: I74db7c1c915a43251400348e0e11791af566cacd