Some refactoring and added support for another form of vbr headers.

related-to-bug: 3172324

Change-Id: Ic364da09eac7f0a815f9ceb719b6baa8a76e3730
8 files changed