Merge "Camera: Support vendor tags from multiple providers" into oc-dev
am: 97e6e199f9

Change-Id: I092f00867fa758935041fb92eca49def221de57a