Fix spurious "ADB not enabled" warning.
am: 957e8622dd

Change-Id: I0b775c43ee0483f14ca771fc0ab2638acb72ee16