Merge "Use screenshot file descriptor if available" am: 6b8e52c805
am: 24591ba9e7

Change-Id: I1d177058b2c1d148f1ed4b6f25319b1af7aafb2d