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

Change-Id: Ia7f8fde09f675fc9eca6fab7c7ee00514525eb17