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

Change-Id: I4d31232ee3ca2f57f581715be76fa3334a3f0560