am 3986feae: am ef5bf469: am bce4b75f: Add JNI_H_INCLUDE as default header search path

Merge commit '3986feae3266a86f0eb4d20fe97588868608b4c1'

* commit '3986feae3266a86f0eb4d20fe97588868608b4c1':
  Add JNI_H_INCLUDE as default header search path