Add back MusicFX and Stk

Change-Id: I9105db636f9c0dc7b474b9f0ffe6328cc2bf01a5