Fix build issues

Change-Id: I898aacc16fa326397c1db04049b7317ab97f08e2
Merge topic 'add_stereo_type_to_pvx' into next

474f49f Fix build issues