[automerger skipped] Add code coverage support to android_app JNI libs. am:...
[automerger skipped] Add code coverage support to android_app JNI libs. am: 37ca4a1e -s ours am: f66a5ace -s ours
am skip reason: Change-Id I47bf3e5d6e78c4518729bdb52616e248156d3cec with SHA-1 87a33e72 is in history
Change-Id: Ia8b8ba95baf4f58142ccc71bc28e5e1120ffbed6