Merge "Fix typo in LayerDrawable"