Merge "Removing legacy XMA code from vp8."