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

Change-Id: I6dd47ae641ad9a6fa2bd561bc7c940b43ef44324