Merge change 7583

* changes:
  Modify libqcamera to be called liboemcamera