Merge "[automerger skipped] Merge "libmedia2_jni: link to libcgrouprc" am:...
Merge "[automerger skipped] Merge "libmedia2_jni: link to libcgrouprc" am: 847de831 am: 751f3484 am: de2654be -s ours am skip reason: change_id Ieebba36417d1f83a5946f927043f15dc8abc188a with SHA1 f7cbc11d is in history"