Merge "WAVExtractor: support ambisonic subformat" am: 5d7e276b21
am: c1cf4c1b51

Change-Id: I48173d3dad4d55e780502ec5a90ebca85794e599