Merge "Remove OMX from compat matrix"

            <regex-instance>vendor[0-9]*_software</regex-instance>

            <regex-instance>vendor[0-9]*_software</regex-instance>

        </interface>

        </interface>

    </hal>

    </hal>

    <hal format="hidl" optional="true">

        <name>android.hardware.media.omx</name>

        <version>1.0</version>

        <interface>

            <name>IOmx</name>

            <instance>default</instance>

        </interface>

        <interface>

            <name>IOmxStore</name>

            <instance>default</instance>

        </interface>

    </hal>

    <hal format="aidl" optional="true">

    <hal format="aidl" optional="true">

        <name>android.hardware.memtrack</name>

        <name>android.hardware.memtrack</name>

        <version>1</version>

        <version>1</version>