Merge "Revert "Do not use unstable Android styable.CheckBoxPreference"" into rvc-dev am: 716816600e am: bfc90b5e3e

Change-Id: I243d6969f98d5224512a6077ff50160c8c118856