Merge "Change prototype for "setCamera" in IMS VideoProvider."
am: c164b159f8

Change-Id: I3abbb1de951f65c226a6849f34946880e9f650ff