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

Change-Id: Idb532fdaacf1ba0cf129d0113ae35dfc07366c29