Merge "Make <clinit> verification stronger for v37+." into nyc-dev
am: 53685b0ae9

* commit '53685b0ae91039ee7e7a803592e580b675d53794':
  Make <clinit> verification stronger for v37+.

Change-Id: I2150524814d0d7e54e58d0df360182589b9144f7