Merge "Clean up layout direction APIs for Drawable"