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

Change-Id: I0feba9b4db05fb1183812a2c84553e862512a1e1