Merge "Add test config to JniInvocation_test" am: 7e7c5b9a8b
am: d0865381b9

Change-Id: Icb009ed4cad697b235a6714d3216f94d4968da75