Merge "Prepend SPS/PPS manually before encryption in HDCP mode. This is" into jb-mr1-dev