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

Change-Id: Ibb2c806035a670f591069a2b73824762b0ad62e0