Merge "Cleaning up TouchFeedbackDrawable and Ripple APIs"