Merge "Revert "Use AVD for checkbox animation.""