Merge "Revert "Do not use unstable Android styable.CheckBoxPreference"" am: 0c8aec59b3 am: 4be2753ed6

Change-Id: Icda8b1ea48e4a4dff7acc6d289f85b446472017f