Merge "Add dependency on jni_headers" am: d2985135d6

Change-Id: Ibd4542573f6cb148141b2834b16178cc09102a0f