Merge "Add option to avoid clobbering visibility of <declare-styleable>"