Revert "UN-caf audio/display... because making the the caf versions build would probably break mako hard."

This reverts commit 59e04264377d3fd4e087deadcbf1cbbddd30e204.