and stop using the incorrect (on Mac) version in adb.. Test: mma Change-Id: If28f6c8d73b03db863be13ed88df81422c3aef87