Merge "Add dependency on jni_headers" am: d2985135d6 am: 28c170427e

Change-Id: I71d75eda1c74b7bfb43b243980dfe188094ea6ce