Merge "Add jni_headers to export only jni.h to vendor and platform." am: 1e942ba689 am: 09b2f6273c am: 8d9a6e1f58
am: cd21970e01

Change-Id: I098f94f296b66eac451ee111a12caa0f79eebc35