Bug: N/A Test: builds Change-Id: I125498ac4257ac4e901c6f2a5f1bfac1432d859d
and stop using the incorrect (on Mac) version in adb.. Test: mma Change-Id: If28f6c8d73b03db863be13ed88df81422c3aef87