Merge "Make non-updatable stubs depend on sdk 29" into rvc-dev