Merge "VideoView2: Handles viewType attribute" into pi-dev
am: 498e03debd

Change-Id: Ife7df31f01da2a1898c6842fc3f0eea316d651ec