Merge "Take advantage of the hardware encoder's ability to prepend SPS/PPS" into jb-mr1-dev