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

Change-Id: I003677e9d18038c327d41d39979492084af1d2a6