Revert screenshot changes to exclude black cutout

* The reverted code sets screenshot area to display size
  -> It breaks cropped screenshots because new size doesn't match
     requested width and height ( as per cropped definition )
  -> It breaks devices with custom hw rotation because
     width and height are swapped

Revert "Get screencap working correctly in landscape mode"

This reverts commit 9ad73bc2.

Revert "Get screenshot to exclude black cutout"

This reverts commit f4e02874.

Change-Id: Id3def3adfb95e8c5e696bf86ed6dfc4f6bcaba87