Merge "Use R field directly for shared lib styleable attrs" into sc-dev