Also cleans up VideoView fields. No functional changes. Bug: 30600463 Change-Id: I42241e376006c328695d46d63f7fdeda409f1a67