Merge "Revert "Notify the OMX component that it's going to be used in "secure" mode.""