Merge "Add option to avoid clobbering visibility of <declare-styleable>"
am: 7b56a5075d

Change-Id: Ic1fd7a78de3829b3c511be0393e6f2c1496ffbbf