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

Change-Id: I72da381b02450b60f22abda561c4ae67ca640dc5