Merge "Camera: Advertise only unique API1 compatible devices" into oc-dev
am: c03b7307eb

Change-Id: I741aa04bee600b73d7f25699b4961ab3a4e14c6e