Android p preview 4
Merge "jni.h: add three missing errors."