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

Change-Id: I559cd5c8487fadd90830fa77878c6b4c05c45f84