Merge "adb: fix build breakage." am: 14d7cdce51 am: a4c4ef463b
am: 07de47eeb3

Change-Id: I935612655924b3263883e0f4bfdba2bdbd9d5386