Merge "adbd is not available for platform" am: 86fe69b5fd am: 4a895ff484 am: ca2c961523

Change-Id: I15c85416230cc004de37dd7e78fbec6670f638d4