Merge "include policy files within media APEX files" into rvc-dev