Merge changes I4e0bd3c3,Ic62acf3a

* changes:
  Revert "Revert "Allow empty IOmxStore implementation""
  Remove dependency on non-Treble OMX