Merge "Remove duplicate styleable declaration" into nyc-dev