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

Change-Id: I58277d099fe10603dc61aa10c8b51fb08d9ae384