Merge "Add mediametrics to ld.config.legacy.txt" am: 9819ade714
am: 1d80f81bd3

Change-Id: Ied4e694a50c00828c930a8ad4ffe4a0db1d12a77