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

Change-Id: I3543aa744583a9cafbac31a6acab0b26b39edb36