Merge "audio: Access header files through header libs"