Merge "Give a copy & paste export ANDROID_SERIAL= line." am: 4be7735a47 am: 65bd018dad am: be0d8a0958

Change-Id: Ie751ad3c924a833f5f02cb9fe9cf2ee10b9e5260