Merge "Add an ndk_headers module for jni.h."
am: 8e361afb5e

Change-Id: Id57cd048dadf89b15998da1d5165ab80d55a59a8