Merge "Add Class.getPrimitiveClass()."
am: b40fa7c330

Change-Id: I3cd039afc5b211ae3da9c9105e30c81023ff73ea