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

Change-Id: I60bbe02e69aa0aa9eba9d91ac8f83f84256cbea4