Merge "Remove ld.config.txt from bionic APEX" am: 9ed719e167 am: f8f384c697

Change-Id: I672282d8737f30f3b6d28fe0aeef716dadd236d1