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

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