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

Change-Id: I47a4b68f57ff90d4c5187798e04f6f0f7349e701