Merge "Fix typo in JniStaticTest" am: 5194103880 am: 87fc38ad27
am: 010623769d

Change-Id: I2b2ca28446b1c2007023e5aebc1eaeaf996f1798