am 0f5cfd9f: am c9baf342: Merge "CTS: Add test for JNI class-loading" into lollipop-cts-dev automerge: d5716c8

* commit '0f5cfd9fdfebf2225d843c80ffb18b17b968dfd6':
  CTS: Add test for JNI class-loading