Merge "Do not use unstable Android styable.CheckBoxPreference" am: e681546f3a am: 6db58b0a02

Change-Id: Ide8abf7a248c5f2ab59c1e4eb3faf17ba1ac6ba1