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

Change-Id: Ibb564e06fe60ff9767eee87eee3283889e26473e