Merge "Restore "Check if current ld.config.txt files is backward compatible"" am: 84d462d885
am: cefa0d78c0

Change-Id: Id6ed3ad63fadc672fd61e7d08b84a5064dec48a3