Merge "Set omx and configstore as optional." into oc-dev
am: 17a0193835

Change-Id: I3115a2c2b21f740d991f8740dfb0414c48d075e8