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

Change-Id: If6aa66c8fbaeac01a5181f037fbcaf81593c4696