Merge "Move two audio APIs back the the greylist." into qt-dev am: 811c8a06e0 am: 6d455c5d16
am: fa564796da

Change-Id: I91e40dba2b553a7fa2e039d53ced6547a03296fb