Merge "Only rotate screenshots on pre-M devices." into emu-2.0-release