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

Change-Id: I2946965e24f620ba610517f1306d7c7993a0d86b