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

Change-Id: I1f1fb3a04d2acc89a5c9035dbe8c4290e09842f7