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

Change-Id: I52f7e796c7d10b707546d6f0bdb6506bfe723cee