Merge "Add 'media' namespace in ld.config.txt"
am: 7fa20386c3

Change-Id: Ieee082530822ce8ffe98b2e5d6fda8aa2267056e