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

Change-Id: I1a5ceb91409da00a270cca8aa2f28a1e936e1336