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

Change-Id: Id4e3a713f0d191dc1bc0f03e60028c421c61af71