Parse UUID string with Long.parseLong

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

Change-Id: I4a67c96e1fcdb68b22447f98bc898638c8c317a0
Merge remote-tracking branch 'cm/android-4.4' into android-4.4