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

Change-Id: Iaf194e4923449f7fcaa793828dbdde87fd721661