Merge "Add defaults for framework stub libs" am: bbbbdccf02

Change-Id: Ie86e6fc4b054c8ebd5655876b392976f8f7bb0bc