Merge "Create full test for ld.config.txt content" am: 9112ee5e03
am: 3a768552a1

Change-Id: I5d8f70f81eaa052f00cfd3879ffeb923a408ccc0