Merge "OMX IL header additions for FLAC" into jb-dev