Merge "Fix .bp files that aren't creating proper artifacts" into rvc-dev