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

Change-Id: Ic884b372d6a9e2d22edca0ca9eadab67fa722859