Merge "VideoView2: Initial integrated version with MediaPlayer2" into pi-dev am: fa97d22b94
am: 82cb765c2a

Change-Id: Iac7468b6c8f34f1bff7ae04536e1296ecdea690d