Merge "Add stubs_defaults for framework modules"
am: d5a308938e

Change-Id: I19b93b2a2ad3216849c6465e18b987a17a4d36b0