[automerger skipped] Merge "Add explicit dependencies on jni_headers" am: a97ec84897 am: d0d2b755f5 -s ours am: f187cfd631 -s ours am: 4e2dcf5da2 -s ours

am skip reason: Change-Id I1b7b4f5ec3f7f96ad61fa0640b86d545990c4e51 with SHA-1 e09babb170 is in history

Change-Id: I9db7bfd9660ea80a20cd32ab31409dcd8f10456a
tree: df5fcaeba2bab46a41b615cc6f56310193b7a86c
  1. doc/
  2. include/
  3. src/
  4. tests/
  5. tools/
  6. Android.bp
  7. OWNERS