Fix Audio Engine FC and order it properly

Change-Id: I55c063fd87506fa440df96da5df3555e21cd3c08