Merge "Add an ndk_headers module for jni.h." am: 8e361afb5e am: 8ee793f04c am: 6a890b4d30
am: 5d93f64a94

Change-Id: I7fed9ced4a83a95910d21442899d211083ab20d0