Android 8.0.0 release 21
Merge "Add test config to JniInvocation_test" am: 7e7c5b9a8b am: d0865381b9 am: d1c6bf341b
am: 4e7b9cfb89

Change-Id: I6be1ad92f1c977547d4372efd9f41ad519856960