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

Change-Id: I9c0d1a94d27dd2598eb32f29adf1150a91feb601