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

Change-Id: I61aa873e064afd0aa5f57f948098aed1d502cc56