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

Change-Id: I70d264fcd5e4d5c1c4f9e106114592c7cd7855fe