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

Change-Id: I151857468d1a35bae8396e612c0a17cbcdf5dea1