Merge "[Ravenwood] Stop using jarjar for framework-minus-apex" into main