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

Change-Id: I6dfd8dd06ee25fbd07f84c3d1f44a5b9418dfc9b