And MP4 code clean ups due to mp4 box changes. Change-Id: I712b2dceb5038bfefa14097fe2fb2ab1fb913cb5
Change-Id: I956704d1bf7d2d018ad65343b462c62b5042aba6