Merge "Adjustments for changes made to java.lang.Class"
am: 1d36e2c312

Change-Id: Ib5bed6b807fdabd3573044e0bc613006d1e2d6c5