Merge "adbd_auth function signature changes." am: 44a12390d4 am: c12a8522f8 am: 48a24c77a5

Change-Id: I74db7c1c915a43251400348e0e11791af566cacd