Merge "HDCP module binderized" into jb-mr1-dev