am 7312c89a: Merge "Ensure screenshots saved through DDMS end with .png."

* commit '7312c89ade9495d42132ec7fdf7db8142da5fa8a':
  Ensure screenshots saved through DDMS end with .png.