Merge "Make framework-res dep in stubs explicit am: 47994f3743" into mainline-prod