am 4862d47c: Merge "Update Class.primitiveType field uses."

* commit '4862d47c72dd12523516d64bfca0faeb3f780f83':
  Update Class.primitiveType field uses.