Merge "Temporary add ld.config.txt build" am: f2098870c1
am: d4e55ce0f7

Change-Id: Id535dee878dc23b37d52e2861c8430fda14cbe1c