Merge "Deprecate ld.config.txt for fully treblelized devices" am: e5013de9ac
am: 7a190055cf

Change-Id: I08195086715fd4e33376478bac502b9a8106583e