[automerger skipped] Merge "Remove ld.config.txt from prebuilts build rule" am: 5979d44e am: f38855b7 am: 786eb6ac -s ours Change-Id: Iae4c15ed336e30714f5fcd8daf7b9031aecf26db