Merge "Allow parsing constant pool of class file 52" am: 4a3fa67c49
am: e209cfd599

Change-Id: I12f649d684dbc93a139f9e3631de6f35dab92090