Merge "Add asan.permitted.paths for the media namespace" into qt-dev
am: 9924f7ee2d

Change-Id: Ic7d3c4b52979e451a63104317c7672f54c904266