Merge DAX changes

Conflicts:
    common/audioserver.te

CRs-fixed: 1081484
Change-Id: I278422370db53e1a52220222b26995318e19d90a
(cherry picked from commit a1ad06f3c26be3249af4a600db8b78510a984468)
4 files changed