Merge "Add defaults for framework stub libs" into rvc-dev am: 7ed187c63e

Change-Id: I573e898b8cb867aaa59c46480e34e8df3ec98e56