Merge "libmedia2_jni: link to libcgrouprc" am: 847de83188
am: 751f3484ed

Change-Id: I72dfa890c7c514eae28dd0ec14cd6bc35c979ffd