Merge "Move resources spec to overlay." into arc-apps