Merge "Cleanup video provider binder code."
am: 398794c0a6

Change-Id: Ibef50e35814530db7d51228336917334c57365d5