Merge "Clean up Outline API, method on drawable"