Merge "Revert "Set omx and configstore as optional."" into oc-dev am: b8e84d240f
am: 92a3c3d75d

Change-Id: I9f2f988465253d16cb8d2881991893d3e42be6d5