am 9b0f4be0: Merge "Track 64bit changes to android/graphics."

* commit '9b0f4be0a20ee48a3ddf56438e846231955bd557':
  Track 64bit changes to android/graphics.