Merge "Add DCHECKS for class-defs only being null for Proxy classes"
am: 639181ce5a

Change-Id: Ibe0b60267b3f948f41a83fc678ee714e0f9b7493