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

Change-Id: Iaf5f7aacacd2eb72b1ba98e19f5fe7589580bdbd