Merge "framework-minus-apex build should include framework-res" into main