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

Change-Id: I72916f51deeb3e7acb74444d8c8ae1bb9547d501