Merge "Make framework-res dep in stubs explicit"