Merge "Add libcgrouprc to ld.config.txt." am: 210b56e9a8 am: 875326a506
am: 6b5f5a202d

Change-Id: I890dc082deaf128c61467feb3c7703b780e99257