adb: Fix host build

Change-Id: I173e920aa836bb0327bfae235022de011f3e2b99
Merge remote-tracking branch 'cm/cm-12.0' into HEAD