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