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

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