Parse UUID string with Long.parseLong

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

Change-Id: I1fb9e4980b2058a4071dd80d0b9abd8efeb870ab
Merge "Parse UUID string with Long.parseLong" into cm-11.0
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0