fix for screenshot animation glitch in portrait

edits by Stefano Semeraro aka Suxsem.

Change-Id: I7a03a24c5b1bfdfe616f940b2bd7be42091f45a6
Parse UUID string with Long.parseLong

Integer.parseInt throws an NFE for values greater than 0x7fffffff.

Change-Id: I1fb9e4980b2058a4071dd80d0b9abd8efeb870ab
Merge "fix for screenshot animation glitch in portrait" into cm-11.0
Merge "Parse UUID string with Long.parseLong" into cm-11.0
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0