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

Change-Id: Iffef42c4050bbda451e9cd99cb90589060b105bd