Migrate to changes for MMAL camera test version