Merge "Add stubs_defaults for framework modules" am: d5a308938e am: 8ebd0d64d0 am: a2514aee66

Change-Id: Ic3b0de1b97fb240274e7d25a90c40bfd5c13c2eb