Merge "Temporary add ld.config.txt build"