Merge "Add dependency on jni_headers" am: d2985135d6 am: 28c170427e am: 293821e269 am: fd5f4b8f74

Change-Id: I2d05e5fc7e76293da427a55effe4af24a2fbf526