Merge "Track 64bit changes to android/graphics."