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

Change-Id: I771d87da4197b11636c4352ded3c74f00f29d9b4