[automerger skipped] Merge "Add defaults for framework stub libs" am:...
[automerger skipped] Merge "Add defaults for framework stub libs" am: bbbbdccf am: d0304586 -s ours
am skip reason: Change-Id I4dda5b44b6d4e76018acb50f46d05816cc4c7f0b with SHA-1 b470bf34 is in history
Change-Id: Ied8c34f08100fe7f538ee909eb68e4148aec106b