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

Change-Id: Id20fc4cc02f571a535b3271019649abd321d4079